diff --git a/inventory/service/host_vars/bridge.openstack.org.yaml b/inventory/service/host_vars/bridge.openstack.org.yaml index df66b3caef..a266667ac8 100644 --- a/inventory/service/host_vars/bridge.openstack.org.yaml +++ b/inventory/service/host_vars/bridge.openstack.org.yaml @@ -284,6 +284,7 @@ cloud_launcher_clouds: - openstackci-keypairs - openstackci-security + # Airship - name: opendevci-airship-kna1 oscc_cloud: opendevci-airship region_name: Kna1 @@ -308,3 +309,18 @@ cloud_launcher_clouds: network: ext-net interfaces: - openstackci-subnet1 + + # OSUOSL + - name: opendevci-osuosl + oscc_cloud: opendevci-osuosl + region_name: RegionOne + profiles: + - openstackci-keypairs + - openstackci-security + + - name: opendevzuul-osuosl + oscc_cloud: opendevzuul-osuosl + region_name: RegionOne + profiles: + - openstackci-keypairs + - openstackci-security diff --git a/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 b/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 index 3e6baed8a4..f84885e10a 100644 --- a/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 +++ b/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 @@ -242,3 +242,23 @@ clouds: project_name: 'Airship_OpenDev_Test' project_domain_name: CCP_Domain_34466 user_domain_name: CCP_Domain_34466 + opendevci-osuosl: + regions: + - RegionOne + auth: + auth_url: https://arm-openstack.osuosl.org:5000/v3 + username: '{{ clouds.opendevci_osuosl_username }}' + password: '{{ clouds.opendevci_osuosl_username }}' + project_name: 'opendevci' + user_domain_name: "Default" + identity_api_version: 3 + opendevzuul-osuosl: + regions: + - RegionOne + auth: + auth_url: https://arm-openstack.osuosl.org:5000/v3 + username: '{{ clouds.opendevzuul_osuosl_username }}' + password: '{{ clouds.opendevzuul_osuosl_username }}' + project_name: 'opendevzuul' + user_domain_name: "Default" + identity_api_version: 3 diff --git a/playbooks/zuul/templates/host_vars/bridge.openstack.org.yaml.j2 b/playbooks/zuul/templates/host_vars/bridge.openstack.org.yaml.j2 index 809a0f3e77..893a4b0d6c 100644 --- a/playbooks/zuul/templates/host_vars/bridge.openstack.org.yaml.j2 +++ b/playbooks/zuul/templates/host_vars/bridge.openstack.org.yaml.j2 @@ -56,6 +56,10 @@ clouds: opendevci_airship_password: password opendevzuul_airship_username: user opendevzuul_airship_password: password + opendevci_osuosl_username: user + opendevci_osuosl_password: password + opendevzuul_osuosl_username: user + opendevzuul_osuosl_password: password gitea_kube_key: Z2l0ZWFfazhzX2tleQ== ansible_cron_disable_job: true