openstack
/
tripleo-common
Code Issues Proposed changes

Merge "Define all api versions in constraints"

This commit is contained in:
Zuul 2020-02-08 03:24:09 +00:00 committed by Gerrit Code Review
parent c62cfcae8c 50df840f78
commit 580ac98b4f
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tripleo_common/constants.py
View File

@ -160,6 +160,12 @@ DO_NOT_ROTATE_LIST = (
PLAN_NAME_PATTERN = '^[a-zA-Z0-9-]+$' 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. # The default version of the Image API to set in overcloudrc.
DEFAULT_IMAGE_API_VERSION = '2' DEFAULT_IMAGE_API_VERSION = '2'

4
tripleo_common/utils/overcloudrc.py
View File

@ -92,8 +92,8 @@ def create_overcloudrc(stack, no_proxy, admin_password, region_name):
'OS_AUTH_TYPE': 'password', 'OS_AUTH_TYPE': 'password',
'OS_PASSWORD': admin_password, 'OS_PASSWORD': admin_password,
'OS_AUTH_URL': overcloud_endpoint.replace('/v2.0', ''), 'OS_AUTH_URL': overcloud_endpoint.replace('/v2.0', ''),
'OS_IDENTITY_API_VERSION': '3', 'OS_IDENTITY_API_VERSION': constants.DEFAULT_IDENTITY_API_VERSION,
'OS_COMPUTE_API_VERSION': '2.latest', 'OS_COMPUTE_API_VERSION': constants.DEFAULT_COMPUTE_API_VERSION,
'OS_IMAGE_API_VERSION': constants.DEFAULT_IMAGE_API_VERSION, 'OS_IMAGE_API_VERSION': constants.DEFAULT_IMAGE_API_VERSION,
'OS_VOLUME_API_VERSION': constants.DEFAULT_VOLUME_API_VERSION, 'OS_VOLUME_API_VERSION': constants.DEFAULT_VOLUME_API_VERSION,
'OS_REGION_NAME': region_name or 'regionOne' 'OS_REGION_NAME': region_name or 'regionOne'