Merge lp:~zulcss/nova/nova-lp-749973 into lp:~hudson-openstack/nova/trunk

[Chuck Short]

This branch contains the fix for lp:749973. VNC is assumed that is default for all in libvirt which LXC does not support yet.

Regards
chuck

[Vish Ishaya (vishvananda)]

personally I would have done this with an and in the if, but it is more just a style preference so I won't block the merge on that.

review: Approve

[Jay Pipes (jaypipes)]

lgtm.

review: Approve

=== modified file 'nova/virt/libvirt_conn.py'
--- nova/virt/libvirt_conn.py	2011-04-04 18:39:39 +0000
+++ nova/virt/libvirt_conn.py	2011-04-05 14:27:34 +0000
@@ -970,7 +970,8 @@
                     'nics': nics}
 
         if FLAGS.vnc_enabled:
-            xml_info['vncserver_host'] = FLAGS.vncserver_host
+            if FLAGS.libvirt_type != 'lxc':
+                xml_info['vncserver_host'] = FLAGS.vncserver_host
         if not rescue:
             if instance['kernel_id']:
                 xml_info['kernel'] = xml_info['basepath'] + "/kernel"