x/packstack
Code Issues Proposed changes

Remove remaining logic for identity v2 api

Browse Source 
Change-Id: I1da80c66b0d01cefd5ac1cb89a75cec00e596bb4
This commit is contained in:
Takashi Kajinami 2024-05-13 15:07:55 +09:00
parent 99cc91ff93
commit f68fab9144
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/packstack.rst
View File

@ -318,7 +318,7 @@ Keystone Config parameters
Password to use for the Identity service 'demo' user. Password to use for the Identity service 'demo' user.
**CONFIG_KEYSTONE_API_VERSION** **CONFIG_KEYSTONE_API_VERSION**
Identity service API version string. ['v2.0', 'v3'] Identity service API version string. ['v3']
**CONFIG_KEYSTONE_TOKEN_FORMAT** **CONFIG_KEYSTONE_TOKEN_FORMAT**
Identity service token format (FERNET). Since Rocky, only FERNET is supported. ['FERNET'] Identity service token format (FERNET). Since Rocky, only FERNET is supported. ['FERNET']

2
packstack/plugins/keystone_100.py
View File

@ -125,7 +125,7 @@ def initConfig(controller):
{"CMD_OPTION": "keystone-api-version", {"CMD_OPTION": "keystone-api-version",
"PROMPT": "Enter the Keystone API version string.", "PROMPT": "Enter the Keystone API version string.",
"OPTION_LIST": ['v2.0', 'v3'], "OPTION_LIST": ['v3'],
"VALIDATORS": [validators.validate_options], "VALIDATORS": [validators.validate_options],
"DEFAULT_VALUE": 'v3', "DEFAULT_VALUE": 'v3',
"MASK_INPUT": False, "MASK_INPUT": False,

6
packstack/puppet/modules/packstack/manifests/provision/tempest.pp
View File

@ -14,9 +14,8 @@ class packstack::provision::tempest ()
} }
# Authentication/Keystone # Authentication/Keystone
$identity_uri = regsubst(lookup('CONFIG_KEYSTONE_PUBLIC_URL'), 'v3', 'v2.0') $identity_uri_v3 = lookup('CONFIG_KEYSTONE_PUBLIC_URL')
$identity_uri_v3 = regsubst(lookup('CONFIG_KEYSTONE_PUBLIC_URL'), 'v2.0', 'v3') $auth_version = lookup('CONFIG_KEYSTONE_API_VERSION')
$auth_version = regsubst(lookup('CONFIG_KEYSTONE_API_VERSION'), '.0', '')
$admin_username = lookup('CONFIG_KEYSTONE_ADMIN_USERNAME') $admin_username = lookup('CONFIG_KEYSTONE_ADMIN_USERNAME')
$admin_password = lookup('CONFIG_KEYSTONE_ADMIN_PW') $admin_password = lookup('CONFIG_KEYSTONE_ADMIN_PW')
$admin_project_name = 'admin' $admin_project_name = 'admin'
@ -128,7 +127,6 @@ class packstack::provision::tempest ()
glance_available => $glance_available, glance_available => $glance_available,
heat_available => $heat_available, heat_available => $heat_available,
horizon_available => $horizon_available, horizon_available => $horizon_available,
identity_uri => $identity_uri,
identity_uri_v3 => $identity_uri_v3, identity_uri_v3 => $identity_uri_v3,
image_alt_ssh_user => $image_alt_ssh_user, image_alt_ssh_user => $image_alt_ssh_user,
image_name_alt => $image_name, image_name_alt => $image_name,

5
releasenotes/notes/remove-keystone-v2-f257cdb7e7e3a4df.yaml Normal file
View File

@ -0,0 +1,5 @@
---
upgrade:
- |
The ``CONFIG_KEYSTONE_API_VERSION`` parameter no longer accepts ``v2.0``.
Identity v2 API was alreday removed from Keystone.