openstack
/
tripleo-common
Code Issues Proposed changes

Merge "Default to Ironic API v1.15"

This commit is contained in:
Jenkins 2016-10-04 12:34:08 +00:00 committed by Gerrit Code Review
parent f5fce80783 0dbf671bb0
commit d0fb1822de
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tripleo_common/actions/base.py
View File

@ -53,7 +53,7 @@ class TripleOAction(base.Action):
ironic_endpoint.url,
token=ctx.auth_token,
region_name=ironic_endpoint.region,
os_ironic_api_version='1.11',
os_ironic_api_version='1.15',
# FIXME(lucasagomes):Paramtetize max_retries and
# max_interval. At the moment since we are dealing with
# a critical bug (#1612622) let's just hardcode the times

2
tripleo_common/tests/actions/test_base.py
View File

@ -36,7 +36,7 @@ class TestActionsBase(tests_base.TestCase):
url='http://ironic/v1', region='ironic-region')
self.action._get_baremetal_client()
mock_client.assert_called_once_with(
'http://ironic/v1', max_retries=12, os_ironic_api_version='1.11',
'http://ironic/v1', max_retries=12, os_ironic_api_version='1.15',
region_name='ironic-region', retry_interval=5, token=mock.ANY)
mock_endpoint.assert_called_once_with('ironic')
mock_cxt.assert_called_once_with()