Merge lp:~smoser/nova/lp812553 into lp:~hudson-openstack/nova/trunk

[Scott Moser]

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. It also seems more readable to me.

[Vish Ishaya (vishvananda)]

lgtm

review: Approve

[Jason Kölker (jason-koelker)]

Syntactic nitpick, the block in the if statement is now double indented. Logic is sound.

review: Needs Fixing

[lp:~smoser/nova/lp812553]

1285. By Scott Moser on 2011-07-20

correct indentation

[Devin Carlen (devcamcar)]

lgtm

review: Approve

[Mandell (mdegerne)]

Gotta love that negative logic.

Nice fix.

review: Approve (community)

=== modified file 'nova/virt/libvirt/connection.py'
--- nova/virt/libvirt/connection.py	2011-07-13 18:19:32 +0000
+++ nova/virt/libvirt/connection.py	2011-07-20 16:26:33 +0000
@@ -1014,10 +1014,9 @@
                     'ebs_root': ebs_root,
                     'volumes': block_device_mapping}
 
-        if FLAGS.vnc_enabled:
-            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 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:
             if instance['kernel_id']:
                 xml_info['kernel'] = xml_info['basepath'] + "/kernel"