From b7ccc12a6b4a9b40dfed45d5337c02523279daf6 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Tue, 1 Mar 2022 08:05:48 -0800
Subject: [PATCH] Remove airship-citycloud resources

We've been told these resources are going away. Trying to remove them
gracefully from nodepool. Once that is done we can remove our configs
here.

Depends-On: https://review.opendev.org/c/openstack/project-config/+/831398
Change-Id: I396ca49ab33c09622dd398012528fe7172c39fe8
---
 inventory/base/hosts.yaml                     |  7 -----
 .../host_vars/bridge.openstack.org.yaml       | 26 -------------------
 ...01.kna1.airship-citycloud.opendev.org.yaml |  4 ---
 .../handlers/main.yaml                        |  3 ---
 .../templates/clouds/nodepool_clouds.yaml.j2  | 14 ----------
 5 files changed, 54 deletions(-)
 delete mode 100644 inventory/service/host_vars/mirror01.kna1.airship-citycloud.opendev.org.yaml

diff --git a/inventory/base/hosts.yaml b/inventory/base/hosts.yaml
index b45eeaa17c..17b21d94ce 100644
--- a/inventory/base/hosts.yaml
+++ b/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:
diff --git a/inventory/service/host_vars/bridge.openstack.org.yaml b/inventory/service/host_vars/bridge.openstack.org.yaml
index 9d04b0a514..548b90e262 100644
--- a/inventory/service/host_vars/bridge.openstack.org.yaml
+++ b/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
diff --git a/inventory/service/host_vars/mirror01.kna1.airship-citycloud.opendev.org.yaml b/inventory/service/host_vars/mirror01.kna1.airship-citycloud.opendev.org.yaml
deleted file mode 100644
index 5d061aa6d3..0000000000
--- a/inventory/service/host_vars/mirror01.kna1.airship-citycloud.opendev.org.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-letsencrypt_certs:
-  mirror01-kna1-airship-citycloud-main:
-    - mirror01.kna1.airship-citycloud.opendev.org
-    - mirror.kna1.airship-citycloud.opendev.org
diff --git a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml
index f8bf8c30ec..ca8793d31a 100644
--- a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml
+++ b/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
 
diff --git a/playbooks/templates/clouds/nodepool_clouds.yaml.j2 b/playbooks/templates/clouds/nodepool_clouds.yaml.j2
index f4ce33048b..165a196a86 100644
--- a/playbooks/templates/clouds/nodepool_clouds.yaml.j2
+++ b/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