opendev/system-config
Code Issues Proposed changes

Move clouds definitions into control-planes-clouds group

Browse Source 
As a short history diversion, at one point we were trying building
diskimage-builder based images for upload to our control-plane
(instead of using upstream generic cloud images).  This didn't really
work because the long-lived production servers led to leaking images
and nodepool wasn't really meant to deal with this lifecycle.

Before this the only thing that needed credentials for the
control-plane clouds was bridge.
Id1161bca8f23129202599dba299c288a6aa29212 reworked things to have a
control-plane-clouds group which would have access to the credential
variables.

So at this point we added
zuul/templates/group_vars/control-plane-clouds.yaml.j2 with stub
variables for testing.

However, we also have the same cloud: variable with stub variables in
zuul/templates/host_vars/bridge.openstack.org.yaml.j2.  This is
overriding the version from control-plane-clouds because it is more
specific (host variable).  Over time this has skewed from the
control-plane-clouds definition, but I think we have not noticed
because we are not updating the control-plane clouds on the non-bridge
(nodepool) nodes any more.

This is a long way of saying remove the bridge-specific definitions,
and just keep the stub variables in the control-plane-clouds group.

Change-Id: I6c1bfe7fdca27d6e34d9691099b0e1c6d30bb967
This commit is contained in:
Ian Wienand 2022-10-13 12:59:00 +11:00
parent 9ff1c82626
commit e65928128b
No known key found for this signature in database
2 changed files with 16 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
playbooks/zuul/templates/group_vars/control-plane-clouds.yaml.j2
View File

@ -24,6 +24,10 @@ clouds:
openstackci_vexxhost_username: user
openstackci_vexxhost_password: password
openstackci_vexxhost_project_name: project
openstackci_citycloud_username: user
openstackci_citycloud_password: password
openstackzuul_citycloud_username: user
openstackzuul_citycloud_password: password
openstackci_linaro_london_username: user
openstackci_linaro_london_password: password
openstackci_linaro_london_project_name: project
@ -52,3 +56,15 @@ clouds:
opendevci_airship_password: password
opendevzuul_airship_username: user
opendevzuul_airship_password: password
opendevci_osuosl_username: user
opendevci_osuosl_password: password
opendevci_osuosl_project_id: project
opendevzuul_osuosl_username: user
opendevzuul_osuosl_password: password
opendevzuul_osuosl_project_id: project
opendevci_inmotion_username: user
opendevci_inmotion_password: password
opendevci_inmotion_project_id: project
opendevzuul_inmotion_username: user
opendevzuul_inmotion_password: password
opendevzuul_inmotion_project_id: project

70
playbooks/zuul/templates/host_vars/bridge.openstack.org.yaml.j2
View File

@ -1,73 +1,3 @@
# Necessary for fake clouds.yaml to be written
clouds:
openstackci_internap_username: user
openstackci_internap_password: password
openstackci_internap_project_name: project
openstackjenkins_internap_username: user
openstackjenkins_internap_password: password
openstackjenkins_internap_project_name: project
openstackci_ovh_username: user
openstackci_ovh_password: password
openstackci_ovh_project_name: project
openstackci_rax_username: user
openstackci_rax_password: password
openstackci_rax_project_id: project
openstackjenkins_rax_username: user
openstackjenkins_rax_password: password
openstackjenkins_rax_project_id: project
openstackjenkins_ovh_username: user
openstackjenkins_ovh_password: password
openstackjenkins_ovh_project_name: project
openstackjenkins_vexxhost_username: user
openstackjenkins_vexxhost_password: password
openstackjenkins_vexxhost_project_name: project
openstackci_vexxhost_username: user
openstackci_vexxhost_password: password
openstackci_vexxhost_project_name: project
openstackci_citycloud_username: user
openstackci_citycloud_password: password
openstackzuul_citycloud_username: user
openstackzuul_citycloud_password: password
openstackci_linaro_london_username: user
openstackci_linaro_london_password: password
openstackci_linaro_london_project_name: project
openstackzuul_linaro_london_username: user
openstackzuul_linaro_london_password: password
openstackzuul_linaro_london_project_name: project
openstackci_linaro_us_username: user
openstackci_linaro_us_password: password
openstackci_linaro_us_project_name: project
openstackzuul_linaro_us_username: user
openstackzuul_linaro_us_password: password
openstackzuul_linaro_us_project_name: project
openstackci_limestone_username: user
openstackci_limestone_password: password
openstackci_limestone_project_name: project
openstackzuul_limestone_username: user
openstackzuul_limestone_password: password
openstackzuul_limestone_project_name: project
openstackci_packethost_username: user
openstackci_packethost_password: password
openstackci_packethost_project_name: project
openstackzuul_packethost_username: user
openstackzuul_packethost_password: password
openstackzuul_packethost_project_name: project
opendevci_airship_username: user
opendevci_airship_password: password
opendevzuul_airship_username: user
opendevzuul_airship_password: password
opendevci_osuosl_username: user
opendevci_osuosl_password: password
opendevci_osuosl_project_id: project
opendevzuul_osuosl_username: user
opendevzuul_osuosl_password: password
opendevzuul_osuosl_project_id: project
opendevci_inmotion_username: user
opendevci_inmotion_password: password
opendevci_inmotion_project_id: project
opendevzuul_inmotion_username: user
opendevzuul_inmotion_password: password
opendevzuul_inmotion_project_id: project
gitea_kube_key: Z2l0ZWFfazhzX2tleQ==
ansible_cron_disable_job: true