Merge "Add airship CI cloud"

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

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

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

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

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

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

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

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