summaryrefslogtreecommitdiffstats
path: root/nova/virt
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-06-17 17:48:52 +0000
committerGerrit Code Review <review@openstack.org>2013-06-17 17:48:52 +0000
commitd6ce08fd8f2b0bf7bcf16a8bea5cec864ab3779b (patch)
tree2851e206d3f5fdd83feaf7fb24379d25e3ef3679 /nova/virt
parentef317edb704deb0c19660525e6f9690d8ebb79c5 (diff)
parent5e0239f93407e03f45a0514c15969509931b9c9c (diff)
Merge "xenapi: ensure agent check respects image flags"
Diffstat (limited to 'nova/virt')
-rw-r--r--nova/virt/xenapi/agent.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/virt/xenapi/agent.py b/nova/virt/xenapi/agent.py
index 273c7bb97..c9e011856 100644
--- a/nova/virt/xenapi/agent.py
+++ b/nova/virt/xenapi/agent.py
@@ -328,7 +328,7 @@ def find_guest_agent(base_dir):
def should_use_agent(instance):
- sys_meta = instance["system_metadata"]
+ sys_meta = utils.instance_sys_meta(instance)
if USE_AGENT_SM_KEY not in sys_meta:
return CONF.xenapi_use_agent_default
else: