From ad93652bad1f8bd04b53dcbe90e84b125d9211ad Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Wed, 19 Feb 2025 18:43:44 +0000
Subject: [PATCH] Switch Nodepool to the new Rackspace Flex project

Once resources are cleaned up in the old SJC3 project, use the new
project credentials instead of the old ones.

Change-Id: Ifd7e8c1b35cb56eb8dfbfc6be13ef24a34023e14
Depends-On: https://review.opendev.org/943065
Depends-On: https://review.opendev.org/943076
---
 playbooks/templates/clouds/nodepool_clouds.yaml.j2  | 13 +++++++++----
 .../zuul/templates/group_vars/nodepool.yaml.j2      |  6 +++---
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/playbooks/templates/clouds/nodepool_clouds.yaml.j2 b/playbooks/templates/clouds/nodepool_clouds.yaml.j2
index f8f49d9818..98114576c0 100644
--- a/playbooks/templates/clouds/nodepool_clouds.yaml.j2
+++ b/playbooks/templates/clouds/nodepool_clouds.yaml.j2
@@ -48,16 +48,21 @@ clouds:
     volume_api_version: 2
   raxflex:
     regions:
+      - name: DFW3
+        values:
+          metrics:
+            statsd:
+              prefix: 'nodepool.task.raxflex-dfw3'
       - name: SJC3
         values:
           metrics:
             statsd:
               prefix: 'nodepool.task.raxflex-sjc3'
     auth:
-      auth_url: 'https://keystone.api.sjc3.rackspacecloud.com/v3'
-      project_id: '{{ nodepool_raxflex_project }}'
-      username: '{{ nodepool_raxflex_username }}'
-      password: '{{ nodepool_raxflex_key }}'
+      auth_url: 'https://keystone.api.{region_name}.rackspacecloud.com/v3'
+      project_id: '{{ nodepool_rax_flex_project }}'
+      username: '{{ nodepool_rax_flex_username }}'
+      password: '{{ nodepool_rax_flex_key }}'
       user_domain_name: rackspace_cloud_domain
   ovh:
     profile: ovh
diff --git a/playbooks/zuul/templates/group_vars/nodepool.yaml.j2 b/playbooks/zuul/templates/group_vars/nodepool.yaml.j2
index bfbff90fa7..66ec113b52 100644
--- a/playbooks/zuul/templates/group_vars/nodepool.yaml.j2
+++ b/playbooks/zuul/templates/group_vars/nodepool.yaml.j2
@@ -33,9 +33,9 @@ nodepool_rackspace_username: user
 nodepool_rackspace_key: apikey
 nodepool_rackspace_password: password
 nodepool_rackspace_project: project
-nodepool_raxflex_username: user
-nodepool_raxflex_key: apikey
-nodepool_raxflex_project: project
+nodepool_rax_flex_username: user
+nodepool_rax_flex_key: apikey
+nodepool_rax_flex_project: project
 nodepool_ovh_username: user
 nodepool_ovh_password: password
 nodepool_ovh_project: project