summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChuck Short <zulcss@ubuntu.com>2011-07-05 08:32:04 -0400
committerChuck Short <zulcss@ubuntu.com>2011-07-05 08:32:04 -0400
commitf9b6c84842cbb494d09de9debaee2ee37d49815c (patch)
tree02515c98fdc41182ea5317c777a53806ad4df542
parent6843421be9cdef1fc12d3480889bdcfd96821e1b (diff)
downloadnova-f9b6c84842cbb494d09de9debaee2ee37d49815c.tar.gz
nova-f9b6c84842cbb494d09de9debaee2ee37d49815c.tar.xz
nova-f9b6c84842cbb494d09de9debaee2ee37d49815c.zip
UML doesnt do vnc as well
-rw-r--r--nova/virt/libvirt/connection.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
index 0c6eaab84..233d14203 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -1015,7 +1015,7 @@ class LibvirtConnection(driver.ComputeDriver):
'volumes': block_device_mapping}
if FLAGS.vnc_enabled:
- if FLAGS.libvirt_type != 'lxc':
+ if FLAGS.libvirt_type != 'lxc' or FLAGS.libvirt_type != 'uml':
xml_info['vncserver_host'] = FLAGS.vncserver_host
xml_info['vnc_keymap'] = FLAGS.vnc_keymap
if not rescue: