diff options
| author | Scott Moser <smoser@ubuntu.com> | 2011-07-19 12:26:41 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2011-07-19 12:26:41 -0400 |
| commit | 9febf1eec69708d8c54b6348e882da384d8b42a9 (patch) | |
| tree | f952c0590f4cdc91722e240dcbc811b403ef6194 | |
| parent | 77db06c908f9c08c80beb11241c0e23247129ad6 (diff) | |
correct broken logic for lxc and uml to avoid adding vnc arguments (LP: #812553)
This fixes the logic, so that lxc and uml will not get vnc arguments added to
their libvirt xml. To also seems more readable to me.
| -rw-r--r-- | nova/virt/libvirt/connection.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py index 977bb7dfe..56aaa6c50 100644 --- a/nova/virt/libvirt/connection.py +++ b/nova/virt/libvirt/connection.py @@ -1014,8 +1014,7 @@ class LibvirtConnection(driver.ComputeDriver): 'ebs_root': ebs_root, 'volumes': block_device_mapping} - if FLAGS.vnc_enabled: - if FLAGS.libvirt_type != 'lxc' or FLAGS.libvirt_type != 'uml': + if FLAGS.vnc_enabled and FLAGS.libvirt_type not in ('lxc', 'uml'): xml_info['vncserver_host'] = FLAGS.vncserver_host xml_info['vnc_keymap'] = FLAGS.vnc_keymap if not rescue: |