summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--nova/virt/xenapi/vmops.py6
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