Switch Rackspace Flex authentication to project_id

For some reason (cache lookup timeouts?) using the project name and
domain wasn't working initially (but did begin working some time
after also logging into the Skyline dashboard). As a matter of
robustness, use the project IDs instead which worked immediately
with no problem.

Since we needed to add new values in our private hostvars for this,
go ahead and separate out the hostvars used for other items too as
future-proofing. These have all been added on the bridge now.

While we're here, do some cleanup of unnecessary default values
pointed out on the previous review.

Change-Id: I850ef61932e9818495fa99e1d13360693f82edd8
This commit is contained in:
Jeremy Stanley 2024-08-23 17:00:59 +00:00
parent 7caf61dc52
commit 546d6a0ed5
4 changed files with 18 additions and 18 deletions

View File

@ -75,25 +75,19 @@ clouds:
- name: SJC3
auth:
auth_url: 'https://keystone.api.sjc3.rackspacecloud.com/v3'
project_name: '{{ clouds.openstackci_rax_project_id }}_Flex'
project_domain_name: rackspace_cloud_domain
username: '{{ clouds.openstackci_rax_username }}'
password: '{{ clouds.openstackci_rax_key }}'
project_id: '{{ clouds.opendevci_raxflex_project_id }}'
username: '{{ clouds.opendevci_raxflex_username }}'
password: '{{ clouds.opendevci_raxflex_key }}'
user_domain_name: rackspace_cloud_domain
interface: public
identity_api_version: '3'
opendevzuul-raxflex:
regions:
- name: SJC3
auth:
auth_url: 'https://keystone.api.sjc3.rackspacecloud.com/v3'
project_name: '{{ clouds.openstackjenkins_rax_project_id }}_Flex'
project_domain_name: rackspace_cloud_domain
username: '{{ clouds.openstackjenkins_rax_username }}'
password: '{{ clouds.openstackjenkins_rax_key }}'
project_id: '{{ clouds.opendevzuul_raxflex_project_id }}'
username: '{{ clouds.opendevzuul_raxflex_username }}'
password: '{{ clouds.opendevzuul_raxflex_key }}'
user_domain_name: rackspace_cloud_domain
interface: public
identity_api_version: '3'
openstackjenkins-ovh:
regions:
- GRA1

View File

@ -55,13 +55,10 @@ clouds:
prefix: 'nodepool.task.raxflex-sjc3'
auth:
auth_url: 'https://keystone.api.sjc3.rackspacecloud.com/v3'
project_name: '{{ nodepool_rackspace_project }}_Flex'
project_domain_name: rackspace_cloud_domain
username: '{{ nodepool_rackspace_username }}'
password: '{{ nodepool_rackspace_key }}'
project_id: '{{ nodepool_raxflex_project }}'
username: '{{ nodepool_raxflex_username }}'
password: '{{ nodepool_raxflex_key }}'
user_domain_name: rackspace_cloud_domain
interface: public
identity_api_version: '3'
ovh:
profile: ovh
# OVH has a weird new ipv6 setup that we can't handle properly

View File

@ -6,9 +6,15 @@ clouds:
openstackci_rax_username: user
openstackci_rax_key: apikey
openstackci_rax_project_id: project
opendevci_raxflex_username: user
opendevci_raxflex_key: apikey
opendevci_raxflex_project_id: project
openstackjenkins_rax_username: user
openstackjenkins_rax_key: apikey
openstackjenkins_rax_project_id: project
opendevzuul_raxflex_username: user
opendevzuul_raxflex_key: apikey
opendevzuul_raxflex_project_id: project
openstackjenkins_ovh_username: user
openstackjenkins_ovh_password: password
openstackjenkins_ovh_project_name: project

View File

@ -33,6 +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_ovh_username: user
nodepool_ovh_password: password
nodepool_ovh_project: project