From 8c4977181bafdbad897fafcc290939cce8587dd4 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Mon, 3 Jun 2024 13:21:31 -0700 Subject: [PATCH] Remove inmotion cloud management This removes management of the inmotion cloud mirror and cloud launcher configs in prepration for retirement of this cloud. We don't remove the cloud from clouds.yaml files as it is a bit more ambiguous as to how long that will be useful (potentially necessary for manual cleanup steps). Instead when we get around to adding openmetal after inmotion has been shutdown and resurrected as a new openmetal cloud we can replace clouds.yaml config then. This cleanup is necessary to avoid errors when the cloud goes away. We will be working with OpenMetal to make this happen. It shouldn't matter if we land this before or after the project-config changes for nodepool cleanup as things are decoupled sufficiently well. Change-Id: I9d224318a9cfac35b867babff92e1071ca23c574 --- hiera/common.yaml | 1 - inventory/base/hosts.yaml | 10 ---------- inventory/service/group_vars/bastion.yaml | 15 --------------- .../mirror02.iad3.inmotion.opendev.org.yaml | 4 ---- .../letsencrypt-create-certs/handlers/main.yaml | 3 --- 5 files changed, 33 deletions(-) delete mode 100644 inventory/service/host_vars/mirror02.iad3.inmotion.opendev.org.yaml diff --git a/hiera/common.yaml b/hiera/common.yaml index 1b846cce11..d9faaa7b4c 100644 --- a/hiera/common.yaml +++ b/hiera/common.yaml @@ -51,7 +51,6 @@ cacti_hosts: - mirror.bhs1.ovh.opendev.org - mirror.gra1.ovh.opendev.org - mirror.regionone.osuosl.opendev.org -- mirror.iad3.inmotion.opendev.org - mirror-update.opendev.org - mirror-update.openstack.org - refstack01.openstack.org diff --git a/inventory/base/hosts.yaml b/inventory/base/hosts.yaml index 6c167afe6c..14a3992083 100644 --- a/inventory/base/hosts.yaml +++ b/inventory/base/hosts.yaml @@ -471,16 +471,6 @@ all: - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDvcw2waOMbEAZE/sjEroZAYm529ulZdS9s3sNs496Fqy9+cvUYz0yQ7ILCgb+oF1yhnJJOn6QvBa5JZnaK4t6RZ3nc2K9iHeOJFoVHBoT7aD82jL6UKK7atdPJNSdlfb/NRkPAQmlE38pd6NLlG+O8/F/GD+XpQsBtE08HyCgEtqlOOszfHTvTzs0jfskJ11Xxe/hzi2GliYY6b9eWdndh/ND/M2ynmLmx645oNn6U7lQ5CnaT7819QNhXBLlyoLzQpkyc3KhJFl9TZrmjVvrzZqPTmSQNilKobbstVaeQ66DQYdAjkrxxXiNQs4VZhu0fG8DsWmiA/XfzpglzSVSRqWunGpbbAcY0LyfCionZbo+RJ11gTRxhgAGEudWlVhOSA8RNQdxtXjw3yoG4KJISeSiiJSRWt1MSAHLLLkvEaDM8qrUSxvEYRLbFIqZxo0Jwsr3BsO0q3PKnPPY02g9y1SUWmlD+UfyVHGz8L5HrRrsYNm9ar+jtzFWC/k3ON/k=' - 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCt9SY765OzM6DJ/h907uqAivJMFFO+0FRYdCwP7FWkqeSphap3GEkcr+dzZl1beUpPGYkAIyAYFR16i0U8VTmI=' - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICb1VqqZO5/dmFaq2IBKFPd6KT+aZr6VeomZw+ysmg7P' - mirror02.iad3.inmotion.opendev.org: - ansible_host: 173.231.253.126 - location: - cloud: opendevci-inmotion - region_name: iad3 - public_v4: 173.231.253.126 - host_keys: - - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDG59ZRqOd4J6wwz4I/Nda8qchggUoRZ9MnaQr5+lHHadbbZjOcpNMk1eZ6k2j85QYxM9i7Ovm3P3MALd9vGfrSDtl49qTaMWKiwlxXZjJYs0HaKBE+SSGWCXbTiJFEFdwGv2p4vuh5zgm7/6U2IVK/+GxTsQ48dEfpoTIyv0I2jzh13K3H717b2FEGMG8/QDUHXRTD3g8ClDyEn/5dVKQjnVkAbeEC/iMV4GvmypQP1yah589BYfwSDQ3pdFdsfinXNvk0u+sJGZQpt6MyL/xm3zgcmu5RJ5o037or0Ij6sIpeZlQXi7sMwZ08vX6PCYnUI1xonePYUB2ORbAIg25pPTc11GvUUmeqPxHcHKNTjwGBnfdaBcieCUSwOLpMuZWPq0umWlSn5NAhMirq4lVE4KfJgRtt04UfB4iu2r9CP0DM4KBqgkm+Zu43Uo8KUyqx0bS/qX0jCiPUCNOh1L4ZvLOwjm++hS0xBEPqC3XIoaKH8L3b2976PmYwp04r5c8=' - - 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBG7NTjBiMfMCAvZg9gVqdR1NRvYvoxMbo8VphSlMHXFePfLUPu0O1re66YrDbv+vECBmp0dt4mNjOSJMwS6aXOI=' - - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICtrlYPMjckqSCKPaKF6F97ntvVBgixWnVBcMpSUhOil' nb01.opendev.org: ansible_host: 104.239.240.55 location: diff --git a/inventory/service/group_vars/bastion.yaml b/inventory/service/group_vars/bastion.yaml index 057b96ac06..351bdf3253 100644 --- a/inventory/service/group_vars/bastion.yaml +++ b/inventory/service/group_vars/bastion.yaml @@ -242,18 +242,3 @@ cloud_launcher_clouds: profiles: - openstackci-keypairs - openstackci-security - - # InMotion Cloud - - name: opendevci-inmotion - oscc_cloud: opendevci-inmotion - region_name: iad3 - profiles: - - openstackci-keypairs - - openstackci-security - - - name: opendevzuul-inmotion - oscc_cloud: opendevzuul-inmotion - region_name: iad3 - profiles: - - openstackci-keypairs - - openstackci-security diff --git a/inventory/service/host_vars/mirror02.iad3.inmotion.opendev.org.yaml b/inventory/service/host_vars/mirror02.iad3.inmotion.opendev.org.yaml deleted file mode 100644 index edb2b69f92..0000000000 --- a/inventory/service/host_vars/mirror02.iad3.inmotion.opendev.org.yaml +++ /dev/null @@ -1,4 +0,0 @@ -letsencrypt_certs: - mirror02-iad3-inmotion-main: - - mirror02.iad3.inmotion.opendev.org - - mirror.iad3.inmotion.opendev.org diff --git a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml index ef3414f7df..8c331d2f3b 100644 --- a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml +++ b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml @@ -213,9 +213,6 @@ - name: letsencrypt updated mirror01-regionone-osuosl-main include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml -- name: letsencrypt updated mirror02-iad3-inmotion-main - include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml - # Gate testing hosts: - name: letsencrypt updated letsencrypt01-main-service include_tasks: roles/letsencrypt-create-certs/handlers/touch_file.yaml