From 049f8747c493aee9d731471923ccfae2fd9635ee Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Fri, 10 Feb 2023 20:22:25 +0000
Subject: [PATCH] Final cleanup of internap/inap/iweb references

The last iteration of this donor environment was taken down at the
end of 2022, let's proceed with final config removal for it.

Change-Id: Icfa9a681f052f69d96fd76c6038a6cd8784d9d8d
---
 .../clouds/bridge_all_clouds.yaml.j2          | 52 -------------------
 .../group_vars/control-plane-clouds.yaml.j2   |  6 ---
 2 files changed, 58 deletions(-)

diff --git a/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 b/playbooks/templates/clouds/bridge_all_clouds.yaml.j2
index 6b8ea5d9f6..499ac6f3fe 100644
--- a/playbooks/templates/clouds/bridge_all_clouds.yaml.j2
+++ b/playbooks/templates/clouds/bridge_all_clouds.yaml.j2
@@ -21,58 +21,6 @@
 #
 
 clouds:
-  # TODO remove inap and iweb entries once we're happy we will no longer
-  # talk to these clouds to clean up their shutdown.
-  openstackci-inap:
-    profile: internap
-    auth:
-      username: '{{ clouds.openstackci_internap_username }}'
-      password: '{{ clouds.openstackci_internap_password }}'
-      project_name: '{{ clouds.openstackci_internap_project_name }}'
-    regions:
-      - name: mtl01
-        values:
-          networks:
-            - name: inap-17301-WAN1102
-              routes_externally: True
-  openstackjenkins-inap:
-    profile: internap
-    auth:
-      username: '{{ clouds.openstackjenkins_internap_username }}'
-      password: '{{ clouds.openstackjenkins_internap_password }}'
-      project_name: '{{ clouds.openstackjenkins_internap_project_name }}'
-    regions:
-      - name: mtl01
-        values:
-          networks:
-            - name: inap-17304-WAN1101
-              routes_externally: True
-  openstackci-iweb:
-    auth:
-      auth_url: https://identity.api.cloud.iweb.com
-      username: '{{ clouds.openstackci_internap_username }}'
-      password: '{{ clouds.openstackci_internap_password }}'
-      project_name: '{{ clouds.openstackci_internap_project_name }}'
-    regions:
-      - name: mtl01
-        values:
-          networks:
-            - name: inap-17301-WAN1102
-              routes_externally: True
-    floating_ip_source: None
-  openstackjenkins-iweb:
-    auth:
-      auth_url: https://identity.api.cloud.iweb.com
-      username: '{{ clouds.openstackjenkins_internap_username }}'
-      password: '{{ clouds.openstackjenkins_internap_password }}'
-      project_name: '{{ clouds.openstackjenkins_internap_project_name }}'
-    regions:
-      - name: mtl01
-        values:
-          networks:
-            - name: inap-17304-WAN1101
-              routes_externally: True
-    floating_ip_source: None
   openstackci-ovh:
     regions:
       - GRA1
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 821d52058b..41e7bbfd18 100644
--- a/playbooks/zuul/templates/group_vars/control-plane-clouds.yaml.j2
+++ b/playbooks/zuul/templates/group_vars/control-plane-clouds.yaml.j2
@@ -1,11 +1,5 @@
 # Necessary for fake clouds.yaml to be written
 clouds:
-  openstackci_internap_username: user
-  openstackci_internap_password: password
-  openstackci_internap_project_name: project
-  openstackjenkins_internap_username: user
-  openstackjenkins_internap_password: password
-  openstackjenkins_internap_project_name: project
   openstackci_ovh_username: user
   openstackci_ovh_password: password
   openstackci_ovh_project_name: project