diff options
| author | Brian Waldon <brian.waldon@rackspace.com> | 2011-08-25 16:05:03 +0000 |
|---|---|---|
| committer | Tarmac <> | 2011-08-25 16:05:03 +0000 |
| commit | f136cf119778b4d5d09e607487cf011b9f16dedb (patch) | |
| tree | b043bdc868c2f12cf394908f0a3851d529452ee1 | |
| parent | ce413a5b5344a79d612e36c64ddbcb7bfb4ac98b (diff) | |
| parent | 42f9739a608b5b6219aa9f51bc90c2d072edc33a (diff) | |
| download | nova-f136cf119778b4d5d09e607487cf011b9f16dedb.tar.gz nova-f136cf119778b4d5d09e607487cf011b9f16dedb.tar.xz nova-f136cf119778b4d5d09e607487cf011b9f16dedb.zip | |
Servers with metadata will now boot on xenserver with flat_injected==False
| -rw-r--r-- | nova/virt/xenapi/vmops.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py index 64c106f47..c5f105f40 100644 --- a/nova/virt/xenapi/vmops.py +++ b/nova/virt/xenapi/vmops.py @@ -239,9 +239,8 @@ class VMOps(object): 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) |