Merge lp:~rackspace-titan/nova/build-failure-lp833856-d4 into lp:~hudson-openstack/nova/milestone-proposed

[Brian Waldon]

porting fix for rebuild failure bug lp:833856

[Vish Ishaya (vishvananda)]

Ha, thx soren. Didn't notice it was missing a commit message.

[Brian Waldon (bcwaldon)]

> Ha, thx soren. Didn't notice it was missing a commit message.

Doesn't the description act as a commit message?

[Brian Waldon (bcwaldon)]

Oh. I see. My bad.

=== modified file 'nova/virt/xenapi/vmops.py'
--- nova/virt/xenapi/vmops.py	2011-08-23 04:17:57 +0000
+++ nova/virt/xenapi/vmops.py	2011-08-25 16:33:34 +0000
@@ -239,9 +239,8 @@
         self._attach_disks(instance, disk_image_type, vm_ref, first_vdi_ref,
             vdis)
 
-        # Alter the image before VM start for, e.g. network injection also
-        # alter the image if there's metadata.
-        if FLAGS.flat_injected or instance['metadata']:
+        # Alter the image before VM start for network injection.
+        if FLAGS.flat_injected:
             VMHelper.preconfigure_instance(self._session, instance,
                                            first_vdi_ref, network_info)