Merge "Bump OS_BAREMETAL_API_VERSION to 1.29" into stable/ocata

This commit is contained in:
Jenkins 2017-06-19 18:38:11 +00:00 committed by Gerrit Code Review
commit cc33ce90ed
3 changed files with 14 additions and 0 deletions

View File

@ -0,0 +1,6 @@
---
fixes:
- |
The default ``OS_BAREMETAL_API_VERSION`` and ``IRONIC_API_VERSION`` in
``overcloudrc`` were bumped to 1.29, which corresponds to Ocata final and
allows using all recent features without specifying an explicit version.

View File

@ -101,3 +101,7 @@ PASSWORD_PARAMETER_NAMES = (
)
PLAN_NAME_PATTERN = '^[a-zA-Z0-9-]+$'
# The default version of the Bare metal API to set in overcloudrc.
# 1.29 is the latest API version in Ironic Ocata supported by ironicclient.
DEFAULT_BAREMETAL_API_VERSION = '1.29'

View File

@ -16,6 +16,8 @@ import socket
from six.moves import urllib
from tripleo_common import constants
def get_service_ips(stack):
service_ips = {}
@ -89,6 +91,8 @@ def create_overcloudrc(stack, no_proxy, admin_password):
'OS_AUTH_TYPE': 'password',
'OS_PASSWORD': admin_password,
'OS_AUTH_URL': overcloud_endpoint,
'OS_BAREMETAL_API_VERSION': constants.DEFAULT_BAREMETAL_API_VERSION,
'IRONIC_API_VERSION': constants.DEFAULT_BAREMETAL_API_VERSION,
}
overcloudrc = CLEAR_ENV