openstack/nova
Code Issues Proposed changes

fix flag names

Browse Source
This commit is contained in:
Anthony Young
2011-03-29 13:32:03 -07:00
parent 3e9b597713
commit dbef492039
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nova/compute/api.py
View File

@@ -614,14 +614,14 @@ class API(base.Base):
output = self._call_compute_message('get_vnc_console', output = self._call_compute_message('get_vnc_console',
context, context,
instance_id) instance_id)
rpc.cast(context, '%s' % FLAGS.vnc_console_proxy_topic, rpc.cast(context, '%s' % FLAGS.vncproxy_topic,
{'method': 'authorize_vnc_console', {'method': 'authorize_vnc_console',
'args': {'token': output['token'], 'args': {'token': output['token'],
'host': output['host'], 'host': output['host'],
'port': output['port']}}) 'port': output['port']}})
return {'url': '%s/vnc_auto.html?token=%s&host=%s&port=%s' % ( return {'url': '%s/vnc_auto.html?token=%s&host=%s&port=%s' % (
FLAGS.vnc_console_proxy_url, FLAGS.vncproxy_url,
output['token'], output['token'],
'hostignore', 'hostignore',
'portignore')} 'portignore')}

6
nova/flags.py
View File

@@ -281,13 +281,13 @@ DEFINE_string('ajax_console_proxy_url',
in the form "http://127.0.0.1:8000"') in the form "http://127.0.0.1:8000"')
DEFINE_string('ajax_console_proxy_port', DEFINE_string('ajax_console_proxy_port',
8000, 'port that ajax_console_proxy binds') 8000, 'port that ajax_console_proxy binds')
DEFINE_string('vnc_console_proxy_topic', 'vncproxy', DEFINE_string('vncproxy_topic', 'vncproxy',
'the topic vnc proxy nodes listen on') 'the topic vnc proxy nodes listen on')
DEFINE_string('vnc_console_proxy_url', DEFINE_string('vncproxy_url',
'http://127.0.0.1:6080', 'http://127.0.0.1:6080',
'location of vnc console proxy, \ 'location of vnc console proxy, \
in the form "http://127.0.0.1:6080"') in the form "http://127.0.0.1:6080"')
DEFINE_string('vnc_server_host', '0.0.0.0', DEFINE_string('vncserver_host', '0.0.0.0',
'the host interface on which vnc server should listen') 'the host interface on which vnc server should listen')
DEFINE_bool('vnc_enabled', True, DEFINE_bool('vnc_enabled', True,
'enable vnc related features') 'enable vnc related features')

4
nova/virt/libvirt.xml.template
View File

@@ -104,8 +104,8 @@
<target port='0'/> <target port='0'/>
</serial> </serial>
#if $getVar('vnc_server_host', False) #if $getVar('vncserver_host', False)
<graphics type='vnc' port='-1' autoport='yes' keymap='en-us' listen='${vnc_server_host}'/> <graphics type='vnc' port='-1' autoport='yes' keymap='en-us' listen='${vncserver_host}'/>
#end if #end if
</devices> </devices>
</domain> </domain>

2
nova/virt/libvirt_conn.py
View File

@@ -885,7 +885,7 @@ class LibvirtConnection(driver.ComputeDriver):
'nics': nics} 'nics': nics}
if FLAGS.vnc_enabled: if FLAGS.vnc_enabled:
xml_info['vnc_server_host'] = FLAGS.vnc_server_host xml_info['vncserver_host'] = FLAGS.vncserver_host
if not rescue: if not rescue:
if instance['kernel_id']: if instance['kernel_id']:
xml_info['kernel'] = xml_info['basepath'] + "/kernel" xml_info['kernel'] = xml_info['basepath'] + "/kernel"

2
nova/vnc/auth.py
View File

@@ -51,7 +51,7 @@ class VNCNovaAuthMiddleware(object):
return self.token_cache[token] return self.token_cache[token]
rval = rpc.call(context.get_admin_context(), rval = rpc.call(context.get_admin_context(),
FLAGS.vnc_console_proxy_topic, FLAGS.vncproxy_topic,
{"method": "check_token", "args": {'token': token}}) {"method": "check_token", "args": {'token': token}})
if rval: if rval:
self.token_cache[token] = rval self.token_cache[token] = rval