summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-19 18:38:11 +0000
committerGerrit Code Review <review@openstack.org>2017-06-19 18:38:11 +0000
commitcc33ce90ed22d28e30c7b898aaa310f5b41e9f52 (patch)
treedf65208bb0129a6c3fe0afdd56bb6f11dce798bc
parent5046bea8c9b5dc819568ee2008271496c6669c9d (diff)
parentc4c3499490f496d79c1438b6d3d941e922e2e5b3 (diff)
Merge "Bump OS_BAREMETAL_API_VERSION to 1.29" into stable/ocata
-rw-r--r--releasenotes/notes/ironic-api-version-d2b4ec1474918f12.yaml6
-rw-r--r--tripleo_common/constants.py4
-rw-r--r--tripleo_common/utils/overcloudrc.py4
3 files changed, 14 insertions, 0 deletions
diff --git a/releasenotes/notes/ironic-api-version-d2b4ec1474918f12.yaml b/releasenotes/notes/ironic-api-version-d2b4ec1474918f12.yaml
new file mode 100644
index 0000000..95dd8e0
--- /dev/null
+++ b/releasenotes/notes/ironic-api-version-d2b4ec1474918f12.yaml
@@ -0,0 +1,6 @@
1---
2fixes:
3 - |
4 The default ``OS_BAREMETAL_API_VERSION`` and ``IRONIC_API_VERSION`` in
5 ``overcloudrc`` were bumped to 1.29, which corresponds to Ocata final and
6 allows using all recent features without specifying an explicit version.
diff --git a/tripleo_common/constants.py b/tripleo_common/constants.py
index f00e036..c40165e 100644
--- a/tripleo_common/constants.py
+++ b/tripleo_common/constants.py
@@ -101,3 +101,7 @@ PASSWORD_PARAMETER_NAMES = (
101) 101)
102 102
103PLAN_NAME_PATTERN = '^[a-zA-Z0-9-]+$' 103PLAN_NAME_PATTERN = '^[a-zA-Z0-9-]+$'
104
105# The default version of the Bare metal API to set in overcloudrc.
106# 1.29 is the latest API version in Ironic Ocata supported by ironicclient.
107DEFAULT_BAREMETAL_API_VERSION = '1.29'
diff --git a/tripleo_common/utils/overcloudrc.py b/tripleo_common/utils/overcloudrc.py
index 64eae52..27fab64 100644
--- a/tripleo_common/utils/overcloudrc.py
+++ b/tripleo_common/utils/overcloudrc.py
@@ -16,6 +16,8 @@ import socket
16 16
17from six.moves import urllib 17from six.moves import urllib
18 18
19from tripleo_common import constants
20
19 21
20def get_service_ips(stack): 22def get_service_ips(stack):
21 service_ips = {} 23 service_ips = {}
@@ -89,6 +91,8 @@ def create_overcloudrc(stack, no_proxy, admin_password):
89 'OS_AUTH_TYPE': 'password', 91 'OS_AUTH_TYPE': 'password',
90 'OS_PASSWORD': admin_password, 92 'OS_PASSWORD': admin_password,
91 'OS_AUTH_URL': overcloud_endpoint, 93 'OS_AUTH_URL': overcloud_endpoint,
94 'OS_BAREMETAL_API_VERSION': constants.DEFAULT_BAREMETAL_API_VERSION,
95 'IRONIC_API_VERSION': constants.DEFAULT_BAREMETAL_API_VERSION,
92 } 96 }
93 97
94 overcloudrc = CLEAR_ENV 98 overcloudrc = CLEAR_ENV