diff options
| author | Anthony Young <sleepsonthefloor@gmail.com> | 2011-03-24 15:55:29 -0700 |
|---|---|---|
| committer | Anthony Young <sleepsonthefloor@gmail.com> | 2011-03-24 15:55:29 -0700 |
| commit | b01742ddb5bfec7e89ccc4cee17800614a0fce3c (patch) | |
| tree | 14650b80a6d2669b9a2aa9c8babc5fa7d28097cf /nova/virt | |
| parent | 71bd388a6c04df68e4392dbb7354cc8b14f596fe (diff) | |
incorporate feedback from termie
Diffstat (limited to 'nova/virt')
| -rw-r--r-- | nova/virt/libvirt.xml.template | 4 | ||||
| -rw-r--r-- | nova/virt/libvirt_conn.py | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/nova/virt/libvirt.xml.template b/nova/virt/libvirt.xml.template index ff98275fc..609784982 100644 --- a/nova/virt/libvirt.xml.template +++ b/nova/virt/libvirt.xml.template @@ -101,8 +101,8 @@ <target port='0'/> </serial> -#if $getVar('vnc_compute_host_iface', False) - <graphics type='vnc' port='-1' autoport='yes' keymap='en-us' listen='${vnc_compute_host_iface}'/> +#if $getVar('vnc_server_host', False) + <graphics type='vnc' port='-1' autoport='yes' keymap='en-us' listen='${vnc_server_host}'/> #end if </devices> </domain> diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py index c3529f512..cb6384e01 100644 --- a/nova/virt/libvirt_conn.py +++ b/nova/virt/libvirt_conn.py @@ -516,6 +516,7 @@ class LibvirtConnection(object): def get_vnc_port_for_instance(instance_name): virt_dom = self._conn.lookupByName(instance_name) xml = virt_dom.XMLDesc(0) + # TODO: use etree instead of minidom dom = minidom.parseString(xml) for graphic in dom.getElementsByTagName('graphics'): @@ -735,7 +736,7 @@ class LibvirtConnection(object): 'driver_type': driver_type} if FLAGS.vnc_enabled: - xml_info['vnc_compute_host_iface'] = FLAGS.vnc_compute_host_iface + xml_info['vnc_server_host'] = FLAGS.vnc_server_host if ra_server: xml_info['ra_server'] = ra_server + "/128" if not rescue: |