From 5e0239f93407e03f45a0514c15969509931b9c9c Mon Sep 17 00:00:00 2001
From: John Garbutt <john.garbutt@rackspace.com>
Date: Wed, 12 Jun 2013 13:21:54 +0100
Subject: xenapi: ensure agent check respects image flags

The tests assumed sys_meta was in a simpler format
when accessed on the compute node. This change fixes
the code to work with the actual format of sys_meta.

Fixes bug 1190198
Change-Id: I31095e25bc86c8a475a58a7325e1ff2b3ae8e15c
---
 nova/virt/xenapi/agent.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nova/virt')

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:
-- 
cgit