From 68af2b31d4851223b7900554125aa5e934b5d6b2 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Tue, 12 Mar 2024 19:17:09 +0000 Subject: [PATCH] Deduplicate Rackspace control plane API keys The clouds.yaml and rackdns config files do not need to use two different Ansible vars to refer to the same credentials. Note that the forward DNS account is separate, and so we still keep those intact. Change-Id: I9dd657f357d32083f2cfd7f074ba0d122ca803c3 --- .../install-launch-node/templates/rax-rdns-auth.conf.j2 | 6 +++--- playbooks/zuul/templates/group_vars/bastion.yaml.j2 | 4 ---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/playbooks/roles/install-launch-node/templates/rax-rdns-auth.conf.j2 b/playbooks/roles/install-launch-node/templates/rax-rdns-auth.conf.j2 index 2b74988646..0beedf2d82 100644 --- a/playbooks/roles/install-launch-node/templates/rax-rdns-auth.conf.j2 +++ b/playbooks/roles/install-launch-node/templates/rax-rdns-auth.conf.j2 @@ -1,4 +1,4 @@ [DEFAULT] -RACKSPACE_USERNAME={{ rackspace_rdns_username }} -RACKSPACE_PROJECT_ID={{ rackspace_rdns_project_id }} -RACKSPACE_API_KEY={{ rackspace_rdns_api_key }} +RACKSPACE_USERNAME={{ clouds.openstackci_rax_username }} +RACKSPACE_PROJECT_ID={{ clouds.openstackci_rax_project_id }} +RACKSPACE_API_KEY={{ clouds.openstackci_rax_key }} diff --git a/playbooks/zuul/templates/group_vars/bastion.yaml.j2 b/playbooks/zuul/templates/group_vars/bastion.yaml.j2 index 20eaa0aeed..dfcfcec145 100644 --- a/playbooks/zuul/templates/group_vars/bastion.yaml.j2 +++ b/playbooks/zuul/templates/group_vars/bastion.yaml.j2 @@ -7,7 +7,3 @@ extra_users: [] rackspace_dns_username: user rackspace_dns_project_id: 1234 rackspace_dns_api_key: apikey - -rackspace_rdns_username: user -rackspace_rdns_project_id: 1234 -rackspace_rdns_api_key: apikey