From e0289dd26821545a6ef2ca91eb2dba7c11c2cc9f Mon Sep 17 00:00:00 2001
From: Anthony Young <sleepsonthefloor@gmail.com>
Date: Wed, 23 Mar 2011 15:53:46 -0700
Subject: general cleanup, use whitelist for webserver security

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

(limited to 'nova/virt')

diff --git a/nova/virt/libvirt.xml.template b/nova/virt/libvirt.xml.template
index 037cd0902..bcc6b3aed 100644
--- a/nova/virt/libvirt.xml.template
+++ b/nova/virt/libvirt.xml.template
@@ -101,7 +101,7 @@
             <target port='0'/>
         </serial>
 
-#if $getVar('vnc_host_iface', False)
+#if $getVar('vnc_compute_host_iface', False)
         <graphics type='vnc' port='-1' autoport='yes' keymap='en-us' listen='${vnc_host_iface}'/>
 #end if
     </devices>
diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py
index 51f263ce9..c3529f512 100644
--- a/nova/virt/libvirt_conn.py
+++ b/nova/virt/libvirt_conn.py
@@ -735,7 +735,7 @@ class LibvirtConnection(object):
                     'driver_type': driver_type}
 
         if FLAGS.vnc_enabled:
-            xml_info['vnc_host_iface'] = FLAGS.vnc_host_iface
+            xml_info['vnc_compute_host_iface'] = FLAGS.vnc_compute_host_iface
         if ra_server:
             xml_info['ra_server'] = ra_server + "/128"
         if not rescue:
-- 
cgit