From 9166780b542aca5cf22c0aa484c748c9ef074283 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Thu, 30 Jan 2020 15:50:58 -0800 Subject: [PATCH] Add airship CI cloud This is a new cloud provided via citycloud that will add resources capable of running Airship jobs. The goal is to use this as a stepping stone to having Airship jobs run on our generic CI resources. This cloud will provide both generic and larger resources to support this. Change-Id: I63fd9023bc11f1382424c8906dc306cee5b3f58d --- playbooks/clouds_layouts.yml | 25 +++++++++++++++++++ .../clouds/bridge_all_clouds.yaml.j2 | 20 +++++++++++++++ .../templates/clouds/bridge_clouds.yaml.j2 | 10 ++++++++ .../clouds/nodepool_builder_clouds.yaml.j2 | 10 ++++++++ .../templates/clouds/nodepool_clouds.yaml.j2 | 10 ++++++++ .../group_vars/control-plane-clouds.yaml.j2 | 4 +++ .../templates/group_vars/nodepool.yaml.j2 | 2 ++ .../host_vars/bridge.openstack.org.yaml.j2 | 4 +++ 8 files changed, 85 insertions(+) diff --git a/playbooks/clouds_layouts.yml b/playbooks/clouds_layouts.yml index 8e421976b8..d2ddb96bce 100644 --- a/playbooks/clouds_layouts.yml +++ b/playbooks/clouds_layouts.yml @@ -377,3 +377,28 @@ clouds: profiles: - openstackci-keypairs - openstackci-security + + - name: opendevci-airship-kna1 + oscc_cloud: opendevci-airship + region_name: Kna1 + profiles: + - openstackci-keypairs + - openstackci-security + - openstackci-networking + routers: + - name: openstackci-router1 + network: ext-net + interfaces: + - openstackci-subnet1 + - name: opendevzuul-airship-kna1 + oscc_cloud: opendevzuul-airship + region_name: Kna1 + profiles: + - openstackci-keypairs + - openstackci-security + - openstackci-networking + routers: + - name: openstackci-router1 + network: ext-net + interfaces: + - openstackci-subnet1 diff --git a/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 b/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 index e994a188d9..1a966698dc 100644 --- a/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 +++ b/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 @@ -294,3 +294,23 @@ clouds: user_domain_name: Default identity_api_version: 3 image_format: 'qcow2' + opendevci-airship: + regions: + - Kna1 + profile: citycloud + auth: + username: '{{ clouds.opendevci_airship_username }}' + password: '{{ clouds.opendevci_airship_password }}' + project_name: 'Airship_OpenDev_Mirror' + project_domain_name: CCP_Domain_34466 + user_domain_name: CCP_Domain_34466 + opendevzuul-airship: + regions: + - Kna1 + profile: citycloud + auth: + username: '{{ clouds.opendevzuul_airship_username }}' + password: '{{ clouds.opendevzuul_airship_password }}' + project_name: 'Airship_OpenDev_Test' + project_domain_name: CCP_Domain_34466 + user_domain_name: CCP_Domain_34466 diff --git a/playbooks/templates/clouds/bridge_clouds.yaml.j2 b/playbooks/templates/clouds/bridge_clouds.yaml.j2 index d4a1d90586..3d48e3b5f7 100644 --- a/playbooks/templates/clouds/bridge_clouds.yaml.j2 +++ b/playbooks/templates/clouds/bridge_clouds.yaml.j2 @@ -160,3 +160,13 @@ clouds: user_domain_name: Default identity_api_version: 3 image_format: 'qcow2' + opendevci-airship: + regions: + - Kna1 + profile: citycloud + auth: + username: '{{ clouds.opendevci_airship_username }}' + password: '{{ clouds.opendevci_airship_password }}' + project_name: 'Airship_OpenDev_Mirror' + project_domain_name: CCP_Domain_34466 + user_domain_name: CCP_Domain_34466 diff --git a/playbooks/templates/clouds/nodepool_builder_clouds.yaml.j2 b/playbooks/templates/clouds/nodepool_builder_clouds.yaml.j2 index 911a237ff8..00d70f1d51 100644 --- a/playbooks/templates/clouds/nodepool_builder_clouds.yaml.j2 +++ b/playbooks/templates/clouds/nodepool_builder_clouds.yaml.j2 @@ -192,3 +192,13 @@ clouds: identity_api_version: 3 floating_ip_source: None image_format: 'qcow2' + airship-citycloud: + regions: + - Kna1 + profile: citycloud + auth: + username: '{{ nodepool_airship_username }}' + password: '{{ nodepool_airship_password }}' + project_name: 'Airship_OpenDev_Test' + project_domain_name: CCP_Domain_34466 + user_domain_name: CCP_Domain_34466 diff --git a/playbooks/templates/clouds/nodepool_clouds.yaml.j2 b/playbooks/templates/clouds/nodepool_clouds.yaml.j2 index 06f075978b..3c46376d79 100644 --- a/playbooks/templates/clouds/nodepool_clouds.yaml.j2 +++ b/playbooks/templates/clouds/nodepool_clouds.yaml.j2 @@ -167,3 +167,13 @@ clouds: identity_api_version: 3 floating_ip_source: None image_format: 'qcow2' + airship-citycloud: + regions: + - Kna1 + profile: citycloud + auth: + username: '{{ nodepool_airship_username }}' + password: '{{ nodepool_airship_password }}' + project_name: 'Airship_OpenDev_Test' + project_domain_name: CCP_Domain_34466 + user_domain_name: CCP_Domain_34466 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 4ddbea697c..2c49df1ce1 100644 --- a/playbooks/zuul/templates/group_vars/control-plane-clouds.yaml.j2 +++ b/playbooks/zuul/templates/group_vars/control-plane-clouds.yaml.j2 @@ -58,3 +58,7 @@ clouds: openstackzuul_fortnebula_username: user openstackzuul_fortnebula_password: password openstackzuul_fortnebula_project_name: project + opendevci_airship_username: user + opendevci_airship_password: password + opendevzuul_airship_username: user + opendevzuul_airship_password: password diff --git a/playbooks/zuul/templates/group_vars/nodepool.yaml.j2 b/playbooks/zuul/templates/group_vars/nodepool.yaml.j2 index 651021b128..a24e924f05 100644 --- a/playbooks/zuul/templates/group_vars/nodepool.yaml.j2 +++ b/playbooks/zuul/templates/group_vars/nodepool.yaml.j2 @@ -29,3 +29,5 @@ nodepool_packethost_project: project nodepool_fortnebula_username: user nodepool_fortnebula_password: password nodepool_fortnebula_project: project +nodepool_airship_username: user +nodepool_airship_password: password 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 00b6322ea5..26a7973d24 100644 --- a/playbooks/zuul/templates/host_vars/bridge.openstack.org.yaml.j2 +++ b/playbooks/zuul/templates/host_vars/bridge.openstack.org.yaml.j2 @@ -58,6 +58,10 @@ clouds: openstackzuul_fortnebula_username: user openstackzuul_fortnebula_password: password openstackzuul_fortnebula_project_name: project + opendevci_airship_username: user + opendevci_airship_password: password + opendevzuul_airship_username: user + opendevzuul_airship_password: password gitea_kube_key: Z2l0ZWFfazhzX2tleQ== ansible_cron_disable_job: true