Update clouds.yaml for citycloud with new auth info

citycloud is rolling out per-region keystone. There is a change with an
error in it in the latest openstacksdk, so put the right auth_url into
the files directly while we update it and release it again.

Additionally, Sto2 and Lon1 each have different domain ids. The domain
names are the same though - and that's good, because logical names are
nicer in config files anyway.

Restore the config for those clouds.

Change-Id: If55d27defc164bd38af2ffd1e7739120389422af
changes/38/612538/3
Monty Taylor 4 years ago
parent 709e7c09cd
commit 449158138e
No known key found for this signature in database
GPG Key ID: 7BAE94BC7141A594

@ -242,6 +242,30 @@ clouds:
- openstackci-keypairs
# Citycloud
- name: openstackci-citycloud-Lon1
oscc_cloud: openstackci-citycloud
region_name: Lon1
profiles:
- openstackci-keypairs
- openstackci-security
- openstackci-networking
routers:
- name: openstackci-router1
network: ext-net
interfaces:
- openstackci-subnet1
- name: openstackzuul-citycloud-Lon1
oscc_cloud: openstackzuul-citycloud
region_name: Lon1
profiles:
- openstackci-keypairs
- openstackci-security
- openstackzuul-networking
routers:
- name: openstackzuul-router1
network: ext-net
interfaces:
- openstackzuul-subnet1
- name: openstackci-citycloud-La1
oscc_cloud: openstackci-citycloud
region_name: La1
@ -290,6 +314,30 @@ clouds:
network: ext-net
interfaces:
- openstackzuul-subnet1
- name: openstackci-citycloud-Sto2
oscc_cloud: openstackci-citycloud
region_name: Sto2
profiles:
- openstackci-keypairs
- openstackci-security
- openstackci-networking
routers:
- name: openstackci-router1
network: ext-net
interfaces:
- openstackci-subnet1
- name: openstackzuul-citycloud-Sto2
oscc_cloud: openstackzuul-citycloud
region_name: Sto2
profiles:
- openstackci-keypairs
- openstackci-security
- openstackzuul-networking
routers:
- name: openstackzuul-router1
network: ext-net
interfaces:
- openstackzuul-subnet1
- name: openstackci-linaro
oscc_cloud: openstackci-linaro
region_name: RegionOne

@ -122,13 +122,18 @@ clouds:
regions:
- Kna1
- La1
- Lon1
- Sto2
profile: citycloud
auth:
# TODO(mordred) This auth_url entry is only needed until openstacksdk
# 0.18.2 or 0.19.0 is released.
auth_url: "https://{region_name}.citycloud.com:5000/v3/"
username: '{{ clouds.openstackci_citycloud_username }}'
password: '{{ clouds.openstackci_citycloud_password }}'
project_id: 656841f5d46e4b0889129d1fc20bd0b8
project_domain_id: a5e7d1a8f25b42b081cf89d1130638da
user_domain_id: a5e7d1a8f25b42b081cf89d1130638da
project_name: 'Default Project 27611'
project_domain_name: CCP_Domain_27611
user_domain_name: CCP_Domain_27611
openstackzuul-citycloud:
regions:
- Kna1

@ -75,13 +75,18 @@ clouds:
regions:
- Kna1
- La1
- Lon1
- Sto2
profile: citycloud
auth:
# TODO(mordred) This auth_url entry is only needed until openstacksdk
# 0.18.2 or 0.19.0 is released.
auth_url: "https://{region_name}.citycloud.com:5000/v3/"
username: '{{ clouds.openstackci_citycloud_username }}'
password: '{{ clouds.openstackci_citycloud_password }}'
project_id: 656841f5d46e4b0889129d1fc20bd0b8
project_domain_id: a5e7d1a8f25b42b081cf89d1130638da
user_domain_id: a5e7d1a8f25b42b081cf89d1130638da
project_name: 'Default Project 27611'
project_domain_name: CCP_Domain_27611
user_domain_name: CCP_Domain_27611
openstackci-linaro:
regions:
- RegionOne

@ -78,11 +78,14 @@ clouds:
profile: citycloud
api_timeout: 60
auth:
# TODO(mordred) This auth_url entry is only needed until openstacksdk
# 0.18.2 or 0.19.0 is released.
auth_url: "https://{region_name}.citycloud.com:5000/v3/"
username: '{{ nodepool_citycloud_username }}'
password: '{{ nodepool_citycloud_password }}'
project_id: bed89257500340af8d0fbe7141b1bfd6
project_domain_id: a5e7d1a8f25b42b081cf89d1130638da
user_domain_id: a5e7d1a8f25b42b081cf89d1130638da
project_name: 'OpenStack CI Project'
project_domain_name: CCP_Domain_27611
user_domain_name: CCP_Domain_27611
linaro:
regions:
- RegionOne

Loading…
Cancel
Save