openstack/shade
Code Issues Proposed changes

Merge "Make ironic use the API version system"

Browse Source
This commit is contained in:
Jenkins 2015-05-28 03:49:53 +00:00 committed by Gerrit Code Review
commit af58168c43
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
shade/__init__.py
View File

@ -307,6 +307,9 @@ class OpenStackCloud(object):
def _get_nova_api_version(self):
return self.api_versions['compute']
def _get_ironic_api_version(self):
return self.api_versions.get('baremetal', '1')
@property
def nova_client(self):
if self._nova_client is None:
@ -2291,7 +2294,7 @@ class OperatorCloud(OpenStackCloud):
endpoint = self.get_session_endpoint(service_key='baremetal')
try:
self._ironic_client = ironic_client.Client(
'1', endpoint, token=token,
self._get_ironic_api_version(), endpoint, token=token,
timeout=self.api_timeout)
except Exception as e:
self.log.debug("ironic auth failed", exc_info=True)