From 0107ce638b5c75bf112d74aab62914ffa5033a96 Mon Sep 17 00:00:00 2001 From: John Garbutt Date: Fri, 7 Jun 2013 14:30:53 +0100 Subject: xenapi: ensure instance metadata always injected into xenstore It is possible to use the agent, cloud-init and config drive together on a single server. In this case we should still be injecting the instance metadata. The current code is inconsistent between spawn and migrations. The correct approach is to always inject the data into xenstore. fixes bug 1188618 Change-Id: I253b34234544cff353985a5b53ec084ea332535a --- nova/virt/xenapi/vmops.py | 6 +----- 1 file changed, 1 insertion(+), 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 -- cgit