openstack
/
shade
Code Issues Proposed changes

Merge "Locking ironic API microversion"

This commit is contained in:
Jenkins 2015-06-29 13:40:43 +00:00 committed by Gerrit Code Review
parent 03cf5c2a99 fceb193f53
commit d729770ea4
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
shade/__init__.py
View File

@ -3218,6 +3218,18 @@ class OperatorCloud(OpenStackCloud):
def ironic_client(self):
if self._ironic_client is None:
token = self.auth_token
# Set the ironic API microversion to a known-good
# supported/tested with the contents of shade.
#
# Note(TheJulia): Defaulted to version 1.6 as the ironic
# state machine changes which will increment the version
# and break an automatic transition of an enrolled node
# to an available state. Locking the version is intended
# to utilize the original transition until shade supports
# calling for node inspection to allow the transition to
# take place automatically.
ironic_api_microversion = '1.6'
if self.auth_type in (None, "None", ''):
# TODO: This needs to be improved logic wise, perhaps a list,
# or enhancement of the data stuctures with-in the library
@ -3232,7 +3244,8 @@ class OperatorCloud(OpenStackCloud):
try:
self._ironic_client = ironic_client.Client(
self.api_versions['baremetal'], endpoint, token=token,
timeout=self.api_timeout)
timeout=self.api_timeout,
os_ironic_api_version=ironic_api_microversion)
except Exception as e:
self.log.debug("ironic auth failed", exc_info=True)
raise OpenStackCloudException(