From acf06a514ad7d182b7abb9ce849597cf19bd2e69 Mon Sep 17 00:00:00 2001 From: Dmitry Tantsur Date: Fri, 24 Nov 2017 14:55:15 +0100 Subject: [PATCH] Stop setting IRONIC_API_VERSION and OS_BAREMETAL_API_VERSION in overcloudrc Starting with python-ironicclient 2.0.0, this is no longer needed to access the latest features, as the default API version is now the latest version supported by both the client and the server. Change-Id: Icfc631484a500fd7730d807bcc0e87da62895187 Closes-Bug: #1671145 --- .../notes/ironic-api-version-latest-328a5894677f801d.yaml | 8 ++++++++ tripleo_common/constants.py | 4 ---- tripleo_common/utils/overcloudrc.py | 2 -- 3 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 releasenotes/notes/ironic-api-version-latest-328a5894677f801d.yaml diff --git a/releasenotes/notes/ironic-api-version-latest-328a5894677f801d.yaml b/releasenotes/notes/ironic-api-version-latest-328a5894677f801d.yaml new file mode 100644 index 000000000..f54201941 --- /dev/null +++ b/releasenotes/notes/ironic-api-version-latest-328a5894677f801d.yaml @@ -0,0 +1,8 @@ +--- +upgrade: + - | + The environment variables ``IRONIC_API_VERSION`` and + ``OS_BAREMETAL_API_VERSION`` are no longer set in ``overcloudrc``. + Starting with python-ironicclient 2.0.0 this will result in the latest + supported API version to be used. Scripts that rely on a particular API + version behavior must set these versions explicitly. diff --git a/tripleo_common/constants.py b/tripleo_common/constants.py index 55b8fa77f..48ea851ee 100644 --- a/tripleo_common/constants.py +++ b/tripleo_common/constants.py @@ -114,10 +114,6 @@ PASSWORD_PARAMETER_NAMES = ( PLAN_NAME_PATTERN = '^[a-zA-Z0-9-]+$' -# The default version of the Bare metal API to set in overcloudrc. -# 1.34 is the latest API version in Ironic Pike supported by ironicclient. -DEFAULT_BAREMETAL_API_VERSION = '1.34' - # The default version of the Image API to set in overcloudrc. DEFAULT_IMAGE_API_VERSION = '2' diff --git a/tripleo_common/utils/overcloudrc.py b/tripleo_common/utils/overcloudrc.py index 70e86cb2d..ade0a620f 100644 --- a/tripleo_common/utils/overcloudrc.py +++ b/tripleo_common/utils/overcloudrc.py @@ -102,8 +102,6 @@ def create_overcloudrc(stack, no_proxy, admin_password): 'OS_PASSWORD': admin_password, 'OS_AUTH_URL': overcloud_endpoint.replace('/v2.0', '') + '/v3', 'OS_IDENTITY_API_VERSION': '3', - 'OS_BAREMETAL_API_VERSION': constants.DEFAULT_BAREMETAL_API_VERSION, - 'IRONIC_API_VERSION': constants.DEFAULT_BAREMETAL_API_VERSION, 'OS_IMAGE_API_VERSION': constants.DEFAULT_IMAGE_API_VERSION, 'OS_VOLUME_API_VERSION': constants.DEFAULT_VOLUME_API_VERSION, }