openstack/ironic
Code Issues Proposed changes

Merge "Use function import_versioned_module from oslo.utils"

Browse Source
This commit is contained in:
Jenkins 2016-10-21 13:41:34 +00:00 committed by Gerrit Code Review
commit 02e3348fbb
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ironic/common/image_service.py
View File

@ -45,15 +45,10 @@ def _get_glance_session():
return _GLANCE_SESSION return _GLANCE_SESSION
def import_versioned_module(version, submodule=None):
module = 'ironic.common.glance_service.v%s' % version
if submodule:
module = '.'.join((module, submodule))
return importutils.try_import(module)
def GlanceImageService(client=None, version=1, context=None): def GlanceImageService(client=None, version=1, context=None):
module = import_versioned_module(version, 'image_service') module_str = 'ironic.common.glance_service'
module = importutils.import_versioned_module(module_str, version,
'image_service')
service_class = getattr(module, 'GlanceImageService') service_class = getattr(module, 'GlanceImageService')
if (context is not None and CONF.glance.auth_strategy == 'keystone' if (context is not None and CONF.glance.auth_strategy == 'keystone'
and not context.auth_token): and not context.auth_token):