From f68fab914412dfed0304d979e5ce4e83b08a4c89 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Mon, 13 May 2024 15:07:55 +0900
Subject: [PATCH] Remove remaining logic for identity v2 api

Change-Id: I1da80c66b0d01cefd5ac1cb89a75cec00e596bb4
---
 docs/packstack.rst                                          | 2 +-
 packstack/plugins/keystone_100.py                           | 2 +-
 .../puppet/modules/packstack/manifests/provision/tempest.pp | 6 ++----
 releasenotes/notes/remove-keystone-v2-f257cdb7e7e3a4df.yaml | 5 +++++
 4 files changed, 9 insertions(+), 6 deletions(-)
 create mode 100644 releasenotes/notes/remove-keystone-v2-f257cdb7e7e3a4df.yaml

diff --git a/docs/packstack.rst b/docs/packstack.rst
index c42b81876..ca108699d 100755
--- a/docs/packstack.rst
+++ b/docs/packstack.rst
@@ -318,7 +318,7 @@ Keystone Config parameters
     Password to use for the Identity service 'demo' user.
 
 **CONFIG_KEYSTONE_API_VERSION**
-    Identity service API version string. ['v2.0', 'v3']
+    Identity service API version string. ['v3']
 
 **CONFIG_KEYSTONE_TOKEN_FORMAT**
     Identity service token format (FERNET). Since Rocky, only FERNET is supported. ['FERNET']
diff --git a/packstack/plugins/keystone_100.py b/packstack/plugins/keystone_100.py
index cb376581a..ac048abd2 100644
--- a/packstack/plugins/keystone_100.py
+++ b/packstack/plugins/keystone_100.py
@@ -125,7 +125,7 @@ def initConfig(controller):
 
             {"CMD_OPTION": "keystone-api-version",
              "PROMPT": "Enter the Keystone API version string.",
-             "OPTION_LIST": ['v2.0', 'v3'],
+             "OPTION_LIST": ['v3'],
              "VALIDATORS": [validators.validate_options],
              "DEFAULT_VALUE": 'v3',
              "MASK_INPUT": False,
diff --git a/packstack/puppet/modules/packstack/manifests/provision/tempest.pp b/packstack/puppet/modules/packstack/manifests/provision/tempest.pp
index 1355e09db..89004e77d 100644
--- a/packstack/puppet/modules/packstack/manifests/provision/tempest.pp
+++ b/packstack/puppet/modules/packstack/manifests/provision/tempest.pp
@@ -14,9 +14,8 @@ class packstack::provision::tempest ()
     }
 
     # Authentication/Keystone
-    $identity_uri          = regsubst(lookup('CONFIG_KEYSTONE_PUBLIC_URL'), 'v3', 'v2.0')
-    $identity_uri_v3       = regsubst(lookup('CONFIG_KEYSTONE_PUBLIC_URL'), 'v2.0', 'v3')
-    $auth_version          = regsubst(lookup('CONFIG_KEYSTONE_API_VERSION'), '.0', '')
+    $identity_uri_v3       = lookup('CONFIG_KEYSTONE_PUBLIC_URL')
+    $auth_version          = lookup('CONFIG_KEYSTONE_API_VERSION')
     $admin_username        = lookup('CONFIG_KEYSTONE_ADMIN_USERNAME')
     $admin_password        = lookup('CONFIG_KEYSTONE_ADMIN_PW')
     $admin_project_name    = 'admin'
@@ -128,7 +127,6 @@ class packstack::provision::tempest ()
       glance_available          => $glance_available,
       heat_available            => $heat_available,
       horizon_available         => $horizon_available,
-      identity_uri              => $identity_uri,
       identity_uri_v3           => $identity_uri_v3,
       image_alt_ssh_user        => $image_alt_ssh_user,
       image_name_alt            => $image_name,
diff --git a/releasenotes/notes/remove-keystone-v2-f257cdb7e7e3a4df.yaml b/releasenotes/notes/remove-keystone-v2-f257cdb7e7e3a4df.yaml
new file mode 100644
index 000000000..5c3311ad2
--- /dev/null
+++ b/releasenotes/notes/remove-keystone-v2-f257cdb7e7e3a4df.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    The ``CONFIG_KEYSTONE_API_VERSION`` parameter no longer accepts ``v2.0``.
+    Identity v2 API was alreday removed from Keystone.