From cf73eda44f29841245343c899b4d7075ace7f8b3 Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jim@acmegating.com>
Date: Thu, 7 Mar 2024 09:05:12 -0800
Subject: [PATCH] Switch rackspace clouds to api key auth

After this merges, the temporary credential set opendevci_rax_*
and opendevzuul_rax_* can be removed from hostvars.

Depends-On: https://review.opendev.org/911163
Change-Id: I2e9067aa2f11100d311c86beb4df5bf15c72db69
---
 .../clouds/bridge_all_clouds.yaml.j2          | 42 ++-----------------
 .../templates/clouds/nodepool_clouds.yaml.j2  | 32 +-------------
 .../group_vars/control-plane-clouds.yaml.j2   |  8 +---
 3 files changed, 8 insertions(+), 74 deletions(-)

diff --git a/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 b/playbooks/templates/clouds/bridge_all_clouds.yaml.j2
index 24b6e253c2..8798a7009d 100644
--- a/playbooks/templates/clouds/bridge_all_clouds.yaml.j2
+++ b/playbooks/templates/clouds/bridge_all_clouds.yaml.j2
@@ -34,42 +34,6 @@ clouds:
       username: '{{ clouds.openstackci_ovh_username }}'
       password: '{{ clouds.openstackci_ovh_password }}'
       project_name: '{{ clouds.openstackci_ovh_project_name }}'
-  opendevci-rax:
-    regions:
-      - name: DFW
-        values:
-          block_storage_endpoint_override: 'https://dfw.blockstorage.api.rackspacecloud.com/v2/'
-      - name: ORD
-        values:
-          block_storage_endpoint_override: 'https://ord.blockstorage.api.rackspacecloud.com/v2/'
-      - name: IAD
-        values:
-          block_storage_endpoint_override: 'https://iad.blockstorage.api.rackspacecloud.com/v2/'
-    profile: rackspace
-    auth:
-      username: '{{ clouds.opendevci_rax_username }}'
-      api_key: '{{ clouds.opendevci_rax_key }}'
-      project_id: '{{ clouds.opendevci_rax_project_id }}'
-    auth_type: 'rackspace_apikey'
-    volume_api_version: 2
-  opendevzuul-rax:
-    regions:
-      - name: DFW
-        values:
-          block_storage_endpoint_override: 'https://dfw.blockstorage.api.rackspacecloud.com/v2/'
-      - name: ORD
-        values:
-          block_storage_endpoint_override: 'https://ord.blockstorage.api.rackspacecloud.com/v2/'
-      - name: IAD
-        values:
-          block_storage_endpoint_override: 'https://iad.blockstorage.api.rackspacecloud.com/v2/'
-    profile: rackspace
-    auth:
-      username: '{{ clouds.opendevzuul_rax_username }}'
-      api_key: '{{ clouds.opendevzuul_rax_key }}'
-      project_id: '{{ clouds.opendevzuul_rax_project_id }}'
-    auth_type: 'rackspace_apikey'
-    volume_api_version: 2
   openstackci-rax:
     regions:
       - name: DFW
@@ -84,8 +48,9 @@ clouds:
     profile: rackspace
     auth:
       username: '{{ clouds.openstackci_rax_username }}'
-      password: '{{ clouds.openstackci_rax_password }}'
+      api_key: '{{ clouds.openstackci_rax_key }}'
       project_id: '{{ clouds.openstackci_rax_project_id }}'
+    auth_type: 'rackspace_apikey'
     volume_api_version: 2
   openstackjenkins-rax:
     regions:
@@ -101,8 +66,9 @@ clouds:
     profile: rackspace
     auth:
       username: '{{ clouds.openstackjenkins_rax_username }}'
-      password: '{{ clouds.openstackjenkins_rax_password }}'
+      api_key: '{{ clouds.openstackjenkins_rax_key }}'
       project_id: '{{ clouds.openstackjenkins_rax_project_id }}'
+    auth_type: 'rackspace_apikey'
     volume_api_version: 2
   openstackjenkins-ovh:
     regions:
diff --git a/playbooks/templates/clouds/nodepool_clouds.yaml.j2 b/playbooks/templates/clouds/nodepool_clouds.yaml.j2
index 6b851280fb..869ae53673 100644
--- a/playbooks/templates/clouds/nodepool_clouds.yaml.j2
+++ b/playbooks/templates/clouds/nodepool_clouds.yaml.j2
@@ -17,35 +17,6 @@ cache:
     port: 5
     floating-ip: 5
 clouds:
-  rackspace:
-    profile: rackspace
-    regions:
-      - name: DFW
-        values:
-          block_storage_endpoint_override: 'https://dfw.blockstorage.api.rackspacecloud.com/v2/'
-          metrics:
-            statsd:
-              prefix: 'nodepool.task.rackspace-dfw'
-      - name: ORD
-        values:
-          block_storage_endpoint_override: 'https://ord.blockstorage.api.rackspacecloud.com/v2/'
-          metrics:
-            statsd:
-              prefix: 'nodepool.task.rackspace-ord'
-      - name: IAD
-        values:
-          block_storage_endpoint_override: 'https://iad.blockstorage.api.rackspacecloud.com/v2/'
-          metrics:
-            statsd:
-              prefix: 'nodepool.task.rackspace-iad'
-    api_timeout: 60
-    auth:
-      username: '{{ nodepool_rackspace_username }}'
-      api_key: '{{ nodepool_rackspace_key }}'
-      project_id: '{{ nodepool_rackspace_project }}'
-    auth_type: 'rackspace_apikey'
-    force_ipv4: true
-    volume_api_version: 2
   rax:
     profile: rackspace
     regions:
@@ -70,8 +41,9 @@ clouds:
     api_timeout: 60
     auth:
       username: '{{ nodepool_rackspace_username }}'
-      password: '{{ nodepool_rackspace_password }}'
+      api_key: '{{ nodepool_rackspace_key }}'
       project_id: '{{ nodepool_rackspace_project }}'
+    auth_type: 'rackspace_apikey'
     force_ipv4: true
     volume_api_version: 2
   ovh:
diff --git a/playbooks/zuul/templates/group_vars/control-plane-clouds.yaml.j2 b/playbooks/zuul/templates/group_vars/control-plane-clouds.yaml.j2
index 9367a8c2a4..592799543b 100644
--- a/playbooks/zuul/templates/group_vars/control-plane-clouds.yaml.j2
+++ b/playbooks/zuul/templates/group_vars/control-plane-clouds.yaml.j2
@@ -3,17 +3,13 @@ clouds:
   openstackci_ovh_username: user
   openstackci_ovh_password: password
   openstackci_ovh_project_name: project
-  opendevci_rax_username: user
-  opendevci_rax_key: apikey
-  opendevci_rax_project_id: project
-  opendevzuul_rax_username: user
-  opendevzuul_rax_key: apikey
-  opendevzuul_rax_project_id: project
   openstackci_rax_username: user
   openstackci_rax_password: password
+  openstackci_rax_key: apikey
   openstackci_rax_project_id: project
   openstackjenkins_rax_username: user
   openstackjenkins_rax_password: password
+  openstackjenkins_rax_key: apikey
   openstackjenkins_rax_project_id: project
   openstackjenkins_ovh_username: user
   openstackjenkins_ovh_password: password