From c3c96d37979405f6ef81dc92f09f429528c30410 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Tue, 21 Jan 2020 13:57:47 +1100 Subject: [PATCH] Add Linaro US cloud Add the credentials for the newly provisioned us.linaro.cloud cloud Change-Id: I0b81a8eeabec4e0b00258dc4e499c1d449b21681 --- inventory/groups.yaml | 2 +- playbooks/clouds_layouts.yml | 14 ++++++++++++ .../clouds/bridge_all_clouds.yaml.j2 | 22 +++++++++++++++++++ .../templates/clouds/bridge_clouds.yaml.j2 | 11 ++++++++++ .../clouds/nodepool_builder_clouds.yaml.j2 | 11 ++++++++++ .../templates/clouds/nodepool_clouds.yaml.j2 | 11 ++++++++++ .../group_vars/control-plane-clouds.yaml.j2 | 6 +++++ .../templates/group_vars/nodepool.yaml.j2 | 3 +++ .../host_vars/bridge.openstack.org.yaml.j2 | 6 +++++ 9 files changed, 85 insertions(+), 1 deletion(-) diff --git a/inventory/groups.yaml b/inventory/groups.yaml index ba5bc1d236..e3f9a32380 100644 --- a/inventory/groups.yaml +++ b/inventory/groups.yaml @@ -177,7 +177,7 @@ groups: - logstash-worker[0-9]*.open*.org - logstash[0-9]*.open*.org - mirror-update[0-9]*.openstack.org - - ^mirror[0-9].*\..*\.(?!linaro|linaro-london).*\.openstack\.org + - ^mirror[0-9].*\..*\.(?!linaro|linaro-london|linaro-us).*\.openstack\.org - ^nb(?!03)[0-9]*\.open.*\.org - nl[0-9]*.open*.org - openstackid[0-9]*.openstack.org diff --git a/playbooks/clouds_layouts.yml b/playbooks/clouds_layouts.yml index cc8c471761..8e421976b8 100644 --- a/playbooks/clouds_layouts.yml +++ b/playbooks/clouds_layouts.yml @@ -336,6 +336,20 @@ clouds: - openstackci-keypairs - openstackci-security + - name: openstackci-linaro-us + oscc_cloud: openstackci-linaro-us + region_name: RegionOne + profiles: + - openstackci-keypairs + - openstackci-security + + - name: openstackzuul-linaro-us + oscc_cloud: openstackzuul-linaro-us + region_name: RegionOne + profiles: + - openstackci-keypairs + - openstackci-security + # Limestone - name: openstackci-limestone oscc_cloud: openstackci-limestone diff --git a/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 b/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 index d39d5bfbfd..3aa49f8271 100644 --- a/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 +++ b/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 @@ -171,6 +171,28 @@ clouds: project_domain_name: default user_domain_name: default identity_api_version: 3 + openstackci-linaro-us: + regions: + - RegionOne + auth: + auth_url: https://us.linaro.cloud:5000 + username: '{{ clouds.openstackci_linaro_us_username }}' + password: '{{ clouds.openstackci_linaro_us_password }}' + project_name: '{{ clouds.openstackci_linaro_us_project_name }}' + project_domain_name: default + user_domain_name: default + identity_api_version: 3 + openstackzuul-linaro-us: + regions: + - RegionOne + auth: + auth_url: https://us.linaro.cloud:5000 + username: '{{ clouds.openstackzuul_linaro_us_username }}' + password: '{{ clouds.openstackzuul_linaro_us_password }}' + project_name: '{{ clouds.openstackzuul_linaro_us_project_name }}' + project_domain_name: default + user_domain_name: default + identity_api_version: 3 openstackci-limestone: regions: - name: RegionOne diff --git a/playbooks/templates/clouds/bridge_clouds.yaml.j2 b/playbooks/templates/clouds/bridge_clouds.yaml.j2 index 02504b71e6..c16c5b35d9 100644 --- a/playbooks/templates/clouds/bridge_clouds.yaml.j2 +++ b/playbooks/templates/clouds/bridge_clouds.yaml.j2 @@ -98,6 +98,17 @@ clouds: project_domain_name: default user_domain_name: default identity_api_version: 3 + openstackci-linaro-us: + regions: + - RegionOne + auth: + auth_url: https://us.linaro.cloud:5000 + username: '{{ clouds.openstackci_linaro_us_username }}' + password: '{{ clouds.openstackci_linaro_us_password }}' + project_name: '{{ clouds.openstackci_linaro_us_project_name }}' + project_domain_name: default + user_domain_name: default + identity_api_version: 3 openstackci-limestone: regions: - name: RegionOne diff --git a/playbooks/templates/clouds/nodepool_builder_clouds.yaml.j2 b/playbooks/templates/clouds/nodepool_builder_clouds.yaml.j2 index 974a34fab4..2e16338fb6 100644 --- a/playbooks/templates/clouds/nodepool_builder_clouds.yaml.j2 +++ b/playbooks/templates/clouds/nodepool_builder_clouds.yaml.j2 @@ -121,6 +121,17 @@ clouds: project_name: '{{ nodepool_linaro_london_project }}' project_domain_name: default user_domain_name: default + linaro-us: + regions: + - RegionOne + identity_api_version: '3' + auth: + auth_url: https://us.linaro.cloud:5000 + username: '{{ nodepool_linaro_us_username }}' + password: '{{ nodepool_linaro_us_password }}' + project_name: '{{ nodepool_linaro_us_project }}' + project_domain_name: default + user_domain_name: default limestone: regions: - name: RegionOne diff --git a/playbooks/templates/clouds/nodepool_clouds.yaml.j2 b/playbooks/templates/clouds/nodepool_clouds.yaml.j2 index 856716495f..b34fa9c6a4 100644 --- a/playbooks/templates/clouds/nodepool_clouds.yaml.j2 +++ b/playbooks/templates/clouds/nodepool_clouds.yaml.j2 @@ -98,6 +98,17 @@ clouds: project_name: '{{ nodepool_linaro_london_project }}' project_domain_name: default user_domain_name: default + linaro-us: + regions: + - RegionOne + identity_api_version: '3' + auth: + auth_url: https://us.linaro.cloud:5000 + username: '{{ nodepool_linaro_us_username }}' + password: '{{ nodepool_linaro_us_password }}' + project_name: '{{ nodepool_linaro_us_project }}' + project_domain_name: default + user_domain_name: default limestone: regions: - name: RegionOne diff --git a/playbooks/zuul/templates/group_vars/control-plane-clouds.yaml.j2 b/playbooks/zuul/templates/group_vars/control-plane-clouds.yaml.j2 index 7e034f166e..4ddbea697c 100644 --- a/playbooks/zuul/templates/group_vars/control-plane-clouds.yaml.j2 +++ b/playbooks/zuul/templates/group_vars/control-plane-clouds.yaml.j2 @@ -34,6 +34,12 @@ clouds: 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 diff --git a/playbooks/zuul/templates/group_vars/nodepool.yaml.j2 b/playbooks/zuul/templates/group_vars/nodepool.yaml.j2 index 8d6deda981..651021b128 100644 --- a/playbooks/zuul/templates/group_vars/nodepool.yaml.j2 +++ b/playbooks/zuul/templates/group_vars/nodepool.yaml.j2 @@ -17,6 +17,9 @@ nodepool_citycloud_password: password nodepool_linaro_london_username: user nodepool_linaro_london_password: password nodepool_linaro_london_project: project +nodepool_linaro_us_username: user +nodepool_linaro_us_password: password +nodepool_linaro_us_project: project nodepool_limestone_username: user nodepool_limestone_password: password nodepool_limestone_project: project 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 1efe88d597..00b6322ea5 100644 --- a/playbooks/zuul/templates/host_vars/bridge.openstack.org.yaml.j2 +++ b/playbooks/zuul/templates/host_vars/bridge.openstack.org.yaml.j2 @@ -34,6 +34,12 @@ clouds: 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