diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-06-11 18:27:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-06-11 18:27:59 +0000 |
| commit | da472b13c4de509829e2ef014cba7cd3854080cc (patch) | |
| tree | 58a825cd6359aa70e2cf1010bca39089f687663c | |
| parent | 3f2b5fdd83b5fc48b6c213837d7a6b71a13fd48b (diff) | |
| parent | 0107ce638b5c75bf112d74aab62914ffa5033a96 (diff) | |
| download | nova-da472b13c4de509829e2ef014cba7cd3854080cc.tar.gz nova-da472b13c4de509829e2ef014cba7cd3854080cc.tar.xz nova-da472b13c4de509829e2ef014cba7cd3854080cc.zip | |
Merge "xenapi: ensure instance metadata always injected into xenstore"
| -rw-r--r-- | nova/virt/xenapi/vmops.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py index e178d08fd..fc3978ef7 100644 --- a/nova/virt/xenapi/vmops.py +++ b/nova/virt/xenapi/vmops.py @@ -508,11 +508,7 @@ class VMOps(object): disk_image_type) self._setup_vm_networking(instance, vm_ref, vdis, network_info, rescue) - - # NOTE(mikal): file injection only happens if we are _not_ using a - # configdrive. - if not configdrive.required_by(instance): - self.inject_instance_metadata(instance, vm_ref) + self.inject_instance_metadata(instance, vm_ref) return vm_ref |