openstack/nova
Code Issues Proposed changes

Merge "xenapi: remove propagate xenapi_use_agent key"

Browse Source
This commit is contained in:
Jenkins 2013-08-08 17:17:12 +00:00 committed by Gerrit Code Review
commit 27ff32ad09
2 changed files with 2 additions and 8 deletions
nova
tests/virt/xenapi/image
test_glance.py
virt/xenapi/image
glance.py

5
nova/tests/virt/xenapi/image/test_glance.py

@ -51,7 +51,7 @@ class TestGlanceStore(stubs.XenAPITestBase):
vm_utils, 'get_sr_path', lambda *a, **kw: '/fake/sr/path')
self.instance = {'uuid': 'blah',
'system_metadata': {'image_xenapi_use_agent': 'true'},
'system_metadata': [],
'auto_disk_config': True,
'os_type': 'default',
'xenapi_use_agent': 'true'}
@ -86,8 +86,7 @@ class TestGlanceStore(stubs.XenAPITestBase):
'sr_path': '/fake/sr/path',
'auth_token': 'foobar',
'properties': {'auto_disk_config': True,
'os_type': 'default',
'xenapi_use_agent': 'true'}}
'os_type': 'default'}}
return params
def test_upload_image(self):

5
nova/virt/xenapi/image/glance.py

@ -17,7 +17,6 @@ from oslo.config import cfg
from nova import exception
from nova.image import glance
from nova.virt.xenapi import agent
from nova.virt.xenapi import vm_utils
CONF = cfg.CONF
@ -61,10 +60,6 @@ class GlanceStore(object):
props['auto_disk_config'] = instance['auto_disk_config']
props['os_type'] = instance['os_type'] or CONF.default_os_type
sys_meta = instance["system_metadata"]
if agent.USE_AGENT_SM_KEY in sys_meta:
props[agent.USE_AGENT_KEY] = sys_meta[agent.USE_AGENT_SM_KEY]
try:
self._call_glance_plugin(session, 'upload_vhd', params)
except exception.PluginRetriesExceeded: