From dbef49203985b4eea82912d010df7204ec68586c Mon Sep 17 00:00:00 2001
From: Anthony Young <sleepsonthefloor@gmail.com>
Date: Tue, 29 Mar 2011 13:32:03 -0700
Subject: fix flag names

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

(limited to 'nova/virt')

diff --git a/nova/virt/libvirt.xml.template b/nova/virt/libvirt.xml.template
index c492e488c..cf6bed530 100644
--- a/nova/virt/libvirt.xml.template
+++ b/nova/virt/libvirt.xml.template
@@ -104,8 +104,8 @@
             <target port='0'/>
         </serial>
 
-#if $getVar('vnc_server_host', False)
-        <graphics type='vnc' port='-1' autoport='yes' keymap='en-us' listen='${vnc_server_host}'/>
+#if $getVar('vncserver_host', False)
+        <graphics type='vnc' port='-1' autoport='yes' keymap='en-us' listen='${vncserver_host}'/>
 #end if
     </devices>
 </domain>
diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py
index 41adbfe27..ec09aca28 100644
--- a/nova/virt/libvirt_conn.py
+++ b/nova/virt/libvirt_conn.py
@@ -885,7 +885,7 @@ class LibvirtConnection(driver.ComputeDriver):
                     'nics': nics}
 
         if FLAGS.vnc_enabled:
-            xml_info['vnc_server_host'] = FLAGS.vnc_server_host
+            xml_info['vncserver_host'] = FLAGS.vncserver_host
         if not rescue:
             if instance['kernel_id']:
                 xml_info['kernel'] = xml_info['basepath'] + "/kernel"
-- 
cgit