Merge lp:~rackspace-titan/nova/boot-failure-lp833856 into lp:~hudson-openstack/nova/trunk

Proposed by Brian Waldon on 2011-08-25
Status: Merged
Approved by: Ed Leafe on 2011-08-25
Approved revision: 1494
Merged at revision: 1493
Proposed branch: lp:~rackspace-titan/nova/boot-failure-lp833856
Merge into: lp:~hudson-openstack/nova/trunk
Diff against target: 14 lines (+2/-3)
1 file modified
nova/virt/xenapi/vmops.py (+2/-3)
To merge this branch: bzr merge lp:~rackspace-titan/nova/boot-failure-lp833856
Reviewer Review Type Date Requested Status
Dan Prince (community) Approve on 2011-08-25
Ed Leafe (community) Approve on 2011-08-25
Josh Kearney (community) 2011-08-25 Approve on 2011-08-25
Review via email: mp+72918@code.launchpad.net

Description of the change

Servers with metadata will now boot on xenserver with flat_injected==False

To post a comment you must log in.
Josh Kearney (jk0) wrote :

LGTM

review: Approve
Ed Leafe (ed-leafe) wrote :

lgtm

review: Approve
Dan Prince (dan-prince) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'nova/virt/xenapi/vmops.py'
2--- nova/virt/xenapi/vmops.py 2011-08-23 04:17:57 +0000
3+++ nova/virt/xenapi/vmops.py 2011-08-25 15:47:17 +0000
4@@ -239,9 +239,8 @@
5 self._attach_disks(instance, disk_image_type, vm_ref, first_vdi_ref,
6 vdis)
7
8- # Alter the image before VM start for, e.g. network injection also
9- # alter the image if there's metadata.
10- if FLAGS.flat_injected or instance['metadata']:
11+ # Alter the image before VM start for network injection.
12+ if FLAGS.flat_injected:
13 VMHelper.preconfigure_instance(self._session, instance,
14 first_vdi_ref, network_info)
15