openstack/shade
Code Issues Proposed changes

Merge "Pass service_name to nova_client constructor"

Browse Source
This commit is contained in:
Jenkins 2015-02-08 15:18:45 +00:00 committed by Gerrit Code Review
commit 09c2b44f95
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
shade/__init__.py
View File

@ -118,6 +118,7 @@ class OpenStackCloud(object):
self._auth_token = kwargs.get('auth_token', None)
self.service_types = _get_service_values(kwargs, 'service_type')
self.service_names = _get_service_values(kwargs, 'service_name')
self.endpoints = _get_service_values(kwargs, 'endpoint')
self.api_versions = _get_service_values(kwargs, 'api_version')
@ -164,6 +165,9 @@ class OpenStackCloud(object):
def get_service_type(self, service):
return self.service_types.get(service, service)
def get_service_name(self, service):
return self.service_names.get(service, None)
def _get_nova_api_version(self):
return self.api_versions['compute']
@ -176,6 +180,7 @@ class OpenStackCloud(object):
self._nova_client = nova_client.Client(
self._get_nova_api_version(),
session=self.keystone_session,
service_name=self.get_service_name('compute'),
region_name=self.region_name)
except Exception:
self.log.debug("Couldn't construct nova object", exc_info=True)