From 1d6f499ca1996ab49a12cc3c72e1538b7be6d7c4 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Mon, 12 Dec 2022 09:07:28 -0800
Subject: [PATCH] Cleanup iweb/inap provider content
This provider is going away and the depends-on change should be the last
step to remove it from nodepool. Once that is complete we can stop
trying to manage the mirror there (it will need to be manually shut
down), stop managing our user accounts, and stop writing cloud.yaml that
include these details for inap/iweb on nodepool nodes.
Note we leave the bridge clouds.yaml content in place so that we can
manually clean up the mirror node. We can safely remove that clouds.yaml
content in the future without much impact.
Depends-On: https://review.opendev.org/c/openstack/project-config/+/867264
Change-Id: I01338712aeae79aa78e7f61d332a2290093c8a1b
---
hiera/common.yaml | 1 -
inventory/base/hosts.yaml | 11 -------
inventory/service/group_vars/bastion.yaml | 14 --------
.../mirror02.mtl01.inap.opendev.org.yaml | 6 ----
.../handlers/main.yaml | 3 --
.../clouds/bridge_all_clouds.yaml.j2 | 2 ++
.../templates/clouds/nodepool_clouds.yaml.j2 | 33 -------------------
7 files changed, 2 insertions(+), 68 deletions(-)
delete mode 100644 inventory/service/host_vars/mirror02.mtl01.inap.opendev.org.yaml
diff --git a/hiera/common.yaml b/hiera/common.yaml
index 1a8dca759e..4ecc93c990 100644
--- a/hiera/common.yaml
+++ b/hiera/common.yaml
@@ -51,7 +51,6 @@ cacti_hosts:
- mirror01.regionone.limestone.opendev.org
- mirror.bhs1.ovh.opendev.org
- mirror.gra1.ovh.opendev.org
-- mirror.mtl01.inap.opendev.org
- mirror02.us-west-1.packethost.openstack.org
- mirror02.regionone.linaro-us.opendev.org
- mirror01.regionone.osuosl.opendev.org
diff --git a/inventory/base/hosts.yaml b/inventory/base/hosts.yaml
index ee6e676bef..124bd7ed52 100644
--- a/inventory/base/hosts.yaml
+++ b/inventory/base/hosts.yaml
@@ -427,17 +427,6 @@ all:
- 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC2TRVy/nt6krFmmGQ5CFr0GYXvS8J/8yr0zAL0LQbT15SaPr96dF6Hx1gR0aYISLNgKAYA5hwLWSy7LmjcMm/bv/TLJQHvk9piVmhKsbJhf9tAcGajOnoG8MqSn4vaptkQxQyvqQcDnGNKMjr+tv5k5rsXAVciC1Ulhw2IWwSKDGYzKO7yVaSI+/7hIVlTm4WREL4pXkf2ybDQuvj+OYv4nrdRePJg6l7yIMWxitzWl0E8LlP+BpoymE7WxAcbS46jdxOK9segfmtMRX3wVwVfgC0XZ+9SDIyfcXkwe2aFFtoAQHJ4G6w9KxcFvHglffv3DRySRg+4WfYJNrnL37XzySL9aFmsbcEM9POd1McCCb+OBvOLHv8sy+g8zzWovsvi4DcNxjCmNzMv+Shjc/rtlRDKAdjd4xOdlUG8gPdo3+wV+P0n+m0JcKxmN6ocx+SZW1oTcmgTzG+M+N+eW3qzoVjv0okY5RqRNSQQ1FDnCvc7lextAxt35DiZBEbCkzk='
- 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFeqlIzcgQGwKfVHGHvjI1uGCmi24DwZqlYpYVc1uLf/E0eUWebFqEWoyEWY7UXyx3X0ky7uFTCSNh7lE6VI9L8='
- 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEEWMuq7/KGoYR97DZZxOkY9oHH0rCmxNaUzt3/3QSC+'
- mirror02.mtl01.inap.opendev.org:
- ansible_host: 198.72.125.6
- location:
- cloud: openstackci-inap
- region_name: mtl01
- public_v4: 198.72.125.6
- public_v6: ''
- host_keys:
- - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC7vAH26cNErBZ1YysfhdrWBV4/AmHxXxoT69w14RboST585HVQHBdvBGs8jPNBPtr4OdHFP81ipIDEc/zk+NXwRNJAV0FxjRcVRreLZq1NNcusk7L0jJDhHWXX1p1TKiE4JQV5rIcAC4+rCz8+K9qHLwf5SjK3OF8E7eok2O+1aL+42dQXajDu+/bdYp6IGQaK8VW0YtB+jpR0J7XVQGm4N0XL2Up0Ig7iwCJu/9goZF/ta2E//wCzaKmALO0JoForjsHbvtJctR6UpDXVYr4SxzYgkoYZ29ePTwFWEvSYgTA6klFjoAgihk2ZP6hOZ/EGp5YL49JE8jlADvu5ley5'
- - 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBB3shzGJqC+uNp/2avQpNsnEbO7rXddD+uQ3uVzS9FI8zpihMhRTI9kNsKcu0PoRK+KgYoEQx22QRSm7f+CVq88='
- - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGY16NRUoQvKYGImfOYg+93BfNlWtnQrU8vFlKDAJ8hP'
mirror01.ord.rax.opendev.org:
ansible_host: 23.253.216.84
location:
diff --git a/inventory/service/group_vars/bastion.yaml b/inventory/service/group_vars/bastion.yaml
index 548b90e262..08a3e9d4cf 100644
--- a/inventory/service/group_vars/bastion.yaml
+++ b/inventory/service/group_vars/bastion.yaml
@@ -199,20 +199,6 @@ cloud_launcher_clouds:
- openstackci-keypairs
- openstackci-security
- # iweb
- - name: openstackci-iweb-mtl01
- oscc_cloud: openstackci-iweb
- region_name: mtl01
- profiles:
- - openstackci-keypairs
- - openstackci-security
- - name: openstackjenkins-iweb-mtl01
- oscc_cloud: openstackjenkins-iweb
- region_name: mtl01
- profiles:
- - openstackci-keypairs
- - openstackci-security
-
# vexxhost
- name: openstackci-vexxhost-mtl1
oscc_cloud: openstackci-vexxhost
diff --git a/inventory/service/host_vars/mirror02.mtl01.inap.opendev.org.yaml b/inventory/service/host_vars/mirror02.mtl01.inap.opendev.org.yaml
deleted file mode 100644
index 8770d12835..0000000000
--- a/inventory/service/host_vars/mirror02.mtl01.inap.opendev.org.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-letsencrypt_certs:
- mirror02-mtl01-inap-main:
- - mirror02.mtl01.inap.opendev.org
- - mirror02.mtl01.iweb.opendev.org
- - mirror.mtl01.inap.opendev.org
- - mirror.mtl01.iweb.opendev.org
diff --git a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml
index 3ae4a8ab3f..a643da5fa7 100644
--- a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml
+++ b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml
@@ -201,9 +201,6 @@
- name: letsencrypt updated mirror02-regionone-linaro-us-main
include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml
-- name: letsencrypt updated mirror02-mtl01-inap-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.yaml
diff --git a/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 b/playbooks/templates/clouds/bridge_all_clouds.yaml.j2
index 272111290d..cb33284936 100644
--- a/playbooks/templates/clouds/bridge_all_clouds.yaml.j2
+++ b/playbooks/templates/clouds/bridge_all_clouds.yaml.j2
@@ -21,6 +21,8 @@
#
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:
diff --git a/playbooks/templates/clouds/nodepool_clouds.yaml.j2 b/playbooks/templates/clouds/nodepool_clouds.yaml.j2
index 2de308d586..56a322d875 100644
--- a/playbooks/templates/clouds/nodepool_clouds.yaml.j2
+++ b/playbooks/templates/clouds/nodepool_clouds.yaml.j2
@@ -66,39 +66,6 @@ clouds:
username: '{{ nodepool_ovh_username }}'
password: '{{ nodepool_ovh_password }}'
project_name: '{{ nodepool_ovh_project }}'
- inap:
- profile: internap
- api_timeout: 60
- auth:
- username: '{{ nodepool_internap_username }}'
- password: '{{ nodepool_internap_password }}'
- project_name: '{{ nodepool_internap_project }}'
- regions:
- - name: mtl01
- values:
- networks:
- - name: inap-17304-WAN1101
- routes_externally: True
- metrics:
- statsd:
- prefix: 'nodepool.task.inap-mtl01'
- iweb:
- api_timeout: 60
- auth:
- auth_url: https://identity.api.cloud.iweb.com
- username: '{{ nodepool_internap_username }}'
- password: '{{ nodepool_internap_password }}'
- project_name: '{{ nodepool_internap_project }}'
- regions:
- - name: mtl01
- values:
- networks:
- - name: inap-17304-WAN1101
- routes_externally: True
- metrics:
- statsd:
- prefix: 'nodepool.task.inap-mtl01'
- floating_ip_source: None
vexxhost:
profile: vexxhost
regions: