From b01742ddb5bfec7e89ccc4cee17800614a0fce3c Mon Sep 17 00:00:00 2001
From: Anthony Young <sleepsonthefloor@gmail.com>
Date: Thu, 24 Mar 2011 15:55:29 -0700
Subject: incorporate feedback from termie

---
 nova/virt/libvirt.xml.template | 4 ++--
 nova/virt/libvirt_conn.py      | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'nova/virt')

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:
-- 
cgit