diff options
| author | Anthony Young <sleepsonthefloor@gmail.com> | 2011-03-23 17:23:04 -0700 |
|---|---|---|
| committer | Anthony Young <sleepsonthefloor@gmail.com> | 2011-03-23 17:23:04 -0700 |
| commit | 61b52830cdce9ac5ec75d744f07764e535bcae35 (patch) | |
| tree | ef57d0b805be6fa91522f863988ea420f911da56 /nova/flags.py | |
| parent | 6912b0e1efd6ba3814d3b29beef236bfe4da52ea (diff) | |
| parent | 85ad729e4448bb4211b79e325cef897fc4e2b0bb (diff) | |
Merge branch 'vnc_console' of git://github.com/sleepsonthefloor/nova into vnc_console
Conflicts:
nova/virt/libvirt_conn.py
Diffstat (limited to 'nova/flags.py')
| -rw-r--r-- | nova/flags.py | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/nova/flags.py b/nova/flags.py index 9123e9ac7..904373a0b 100644 --- a/nova/flags.py +++ b/nova/flags.py @@ -281,6 +281,16 @@ DEFINE_string('ajax_console_proxy_url', in the form "http://127.0.0.1:8000"') DEFINE_string('ajax_console_proxy_port', 8000, 'port that ajax_console_proxy binds') +DEFINE_string('vnc_console_proxy_topic', 'vnc_proxy', + 'the topic vnc proxy nodes listen on') +DEFINE_string('vnc_console_proxy_url', + 'http://127.0.0.1:6080', + 'location of vnc console proxy, \ + in the form "http://127.0.0.1:6080"') +DEFINE_string('vnc_compute_host_iface', '0.0.0.0', + 'the compute host interface on which vnc server should listen') +DEFINE_bool('vnc_enabled', True, + 'enable vnc related features') DEFINE_bool('verbose', False, 'show debug output') DEFINE_boolean('fake_rabbit', False, 'use a fake rabbit') DEFINE_bool('fake_network', False, |