From 50df840f78f10dd77230e6ae3818fda67300e475 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Fri, 31 Jan 2020 12:33:27 +0900 Subject: [PATCH] Define all api versions in constraints This patch adds constraints for identity api version and compute api version, so that we can have all api version defined in one place. Change-Id: I5ff4a99b9cb69058c584d57d4332c423babc9597 --- tripleo_common/constants.py | 6 ++++++ tripleo_common/utils/overcloudrc.py | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/tripleo_common/constants.py b/tripleo_common/constants.py index 8f2a6cb68..6807365f3 100644 --- a/tripleo_common/constants.py +++ b/tripleo_common/constants.py @@ -160,6 +160,12 @@ DO_NOT_ROTATE_LIST = ( PLAN_NAME_PATTERN = '^[a-zA-Z0-9-]+$' +# The default version of the Identity API to set in overcloudrc. +DEFAULT_IDENTITY_API_VERSION = '3' + +# The default version of the Compute API to set in overcloudrc. +DEFAULT_COMPUTE_API_VERSION = '2.latest' + # 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 bf83eca70..356c17211 100644 --- a/tripleo_common/utils/overcloudrc.py +++ b/tripleo_common/utils/overcloudrc.py @@ -94,8 +94,8 @@ def create_overcloudrc(stack, no_proxy, admin_password, region_name): 'OS_AUTH_TYPE': 'password', 'OS_PASSWORD': admin_password, 'OS_AUTH_URL': overcloud_endpoint.replace('/v2.0', ''), - 'OS_IDENTITY_API_VERSION': '3', - 'OS_COMPUTE_API_VERSION': '2.latest', + 'OS_IDENTITY_API_VERSION': constants.DEFAULT_IDENTITY_API_VERSION, + 'OS_COMPUTE_API_VERSION': constants.DEFAULT_COMPUTE_API_VERSION, 'OS_IMAGE_API_VERSION': constants.DEFAULT_IMAGE_API_VERSION, 'OS_VOLUME_API_VERSION': constants.DEFAULT_VOLUME_API_VERSION, 'OS_REGION_NAME': region_name or 'regionOne'