Merge "xenapi: ensure instance metadata always injected into xenstore"

2013-06-11 18:27:59 +00:00
parent 3f2b5fdd83 0107ce638b
commit da472b13c4
1 changed files with 1 additions and 5 deletions
@@ -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