Merge "Remove airship-citycloud resources"

inventory/base/hosts.yaml

@@ -515,13 +515,6 @@ all:
         region_name: RegionOne
       public_v4: 216.245.200.130
       public_v6: 2607:ff68:100:54:f816:3eff:feb5:4635
-    mirror01.kna1.airship-citycloud.opendev.org:
-      ansible_host: 188.212.109.26
-      location:
-        cloud: opendevci-airship
-        region_name: kna1
-      public_v4: 188.212.109.26
-      public_v6: ''
     mirror01.regionone.osuosl.opendev.org:
       ansible_host: 140.211.167.73
       location:

inventory/service/host_vars/bridge.openstack.org.yaml

@@ -300,32 +300,6 @@ cloud_launcher_clouds:
       - openstackci-keypairs
       - openstackci-security
 
-  # Airship
-  - 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
-
   # OSUOSL
   - name: opendevci-osuosl
     oscc_cloud: opendevci-osuosl

inventory/service/host_vars/mirror01.kna1.airship-citycloud.opendev.org.yaml

@@ -1,4 +0,0 @@
-letsencrypt_certs:
-  mirror01-kna1-airship-citycloud-main:
-    - mirror01.kna1.airship-citycloud.opendev.org
-    - mirror.kna1.airship-citycloud.opendev.org

playbooks/roles/letsencrypt-create-certs/handlers/main.yaml

@@ -204,9 +204,6 @@
 - name: letsencrypt updated mirror02-mtl01-inap-main
   include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml
 
-- name: letsencrypt updated mirror01-kna1-airship-citycloud-main
-  include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml
-
 - name: letsencrypt updated mirror01-sjc1-vexxhost-main
   include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yam
 

playbooks/templates/clouds/nodepool_clouds.yaml.j2

@@ -185,20 +185,6 @@ clouds:
       project_domain_name: default
     identity_api_version: '3'
     image_format: 'raw'
-  airship-citycloud:
-    regions:
-      - name: Kna1
-        values:
-          metrics:
-            statsd:
-              prefix: 'nodepool.task.airship-citycloud-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
   osuosl:
     regions:
       - name: RegionOne