From 15ac7a28aa213d23fbdbfed7577989307e3e9e1b Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Sat, 4 Mar 2023 10:07:15 -0800
Subject: [PATCH] Remove gitea05-08 from configuration management
At this point these four servers have been replaced by four new Jammy
servers at gitea09-12. They are no longer behind the opendev.org load
balancer, and Gerrit is not replicating to them. We should remove them
to stop consuming unnecessary resources and avoid any future confusion.
Change-Id: I636b1ed83ed433f3adca2a8b4523335c6a62c702
---
hiera/common.yaml | 4 --
inventory/base/hosts.yaml | 44 -------------------
.../host_vars/gitea05.opendev.org.yaml | 4 --
.../host_vars/gitea06.opendev.org.yaml | 4 --
.../host_vars/gitea07.opendev.org.yaml | 4 --
.../host_vars/gitea08.opendev.org.yaml | 4 --
.../handlers/main.yaml | 12 -----
7 files changed, 76 deletions(-)
delete mode 100644 inventory/service/host_vars/gitea05.opendev.org.yaml
delete mode 100644 inventory/service/host_vars/gitea06.opendev.org.yaml
delete mode 100644 inventory/service/host_vars/gitea07.opendev.org.yaml
delete mode 100644 inventory/service/host_vars/gitea08.opendev.org.yaml
diff --git a/hiera/common.yaml b/hiera/common.yaml
index 2b71e55482..ed1c44f294 100644
--- a/hiera/common.yaml
+++ b/hiera/common.yaml
@@ -20,10 +20,6 @@ cacti_hosts:
- gitea02.opendev.org
- gitea03.opendev.org
- gitea04.opendev.org
-- gitea05.opendev.org
-- gitea06.opendev.org
-- gitea07.opendev.org
-- gitea08.opendev.org
- gitea09.opendev.org
- gitea10.opendev.org
- gitea11.opendev.org
diff --git a/inventory/base/hosts.yaml b/inventory/base/hosts.yaml
index 5ce8e78b89..0c4cd77fc4 100644
--- a/inventory/base/hosts.yaml
+++ b/inventory/base/hosts.yaml
@@ -209,50 +209,6 @@ all:
- 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCwEGD05NeF9JbZh9th8RlhTQnDaKQZg6pezEi+4ImD1UDNqITwlOmvCvss9YZp8Sg5Eqs/oRxqV2OU2dHh1wCrDbG5SwKQl87hEn+V7sMcg3h0sDuUIzwuPfpfve29YdF6Gbh+Mjjm3qEVQW/Tr8ss8g6BcRjVW7k9hHxiTPVJ6Yh82vRbw4PsLi6XY7joTd7jcswXvBArPNCQM4GQQheee+2m5E/S+lL4iMWYCeLxqaVWHwK2P/LRjWDYy4e9vGHt0Nc0sboF6xz1VGDF5w3W0uqiGyIkbTPJaKyOwFdlsv6OLBO8P94Wq0FkEfbbsA0d0en3bdcpGMDiNQJ99qz/'
- 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEDFJcl+os0cbSa4Um5eR8LlUF2fZCsjjtNGeqF8A5L3'
- 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJI7NSFRICk2tki7KIU2O2JP2wGo65UeqgjvmsTnue8SM0pYVNmofmOIb0mHOIUocBmQuFWtRANKnoXnjd+M1jE='
- gitea05.opendev.org:
- ansible_host: 38.108.68.131
- location:
- cloud: openstackci-vexxhost
- region_name: sjc1
- public_v4: 38.108.68.131
- public_v6: 2604:e100:3:0:f816:3eff:fe5b:61ec
- host_keys:
- - 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBG645ALYz8Y3KkVbo7ISiDxSxZwWljzOcDcSPHfuttesNA8is5Wk8338p44feLsN6IuZpa+CAlpxozbWbdbMslU='
- - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDOzM4x3EA4cAItquX61GjCA2IGqMyUXt+WvX83MrCIqJsm0papsx4xoLfsyBYJgAN+FY021T5kqMX3uWmhKMiCwQct2r2eN12B5Jn+Xoyrw/4zrH5d7A9saJOXXPdeQFczbRksMO/DPl6AF8kTHV4AYGeQLkKFdpJJuAcphv1QLMp9XAa3hrUrP1uDtYbmKNswC6n+U9lAs8/9UsUPH5Q7qOi2uIi4chpG/k+NvJtnY8Edemegxal5auAqPe+FRB5w9DMDa4u8fuSa6fcTWPKPQBNdwwIlZ4hP98jUkTyQyDSGZMeppn71u5Pjaro6dS15SnIPWGLY62OGdQGJKWtb'
- - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEP9Y12Jwjs+SbPGVjb1mjuQrgV5jKUBIdxSDwUohwTk'
- gitea06.opendev.org:
- ansible_host: 38.108.68.250
- location:
- cloud: openstackci-vexxhost
- region_name: sjc1
- public_v4: 38.108.68.250
- public_v6: 2604:e100:3:0:f816:3eff:fe72:b4a9
- host_keys:
- - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDildH67aJugknbQmdr4IsMUAPs1PG4JadalBNZW9SDn5am8LQ1gzp2pHzJUuiHtuRF6KkMbHRi6rAgkl5PEiWIyRcIEBQdYxAJoig8UJIdMTfdNapI6M6NzeKrwe4xaeRzJUITisY7dKoYJJF27RyUcXWiKLZgAnJVYeMzWVIecVeCLHw2vkZ4AYqDaCW8J2ZHNRn2EM2g2cl7t665MWTGKN8+LDnWwp43HkzEYiW0o/SBgFHYo8999f2jOaT1E6Hqg/9efNxvK39O78i4n1Hgi76nFnnSejayMbWslJ2r5u1iv+J67wNHh0Ht9OYtwlfiPPJfCa+dNZJ1+Qp4Rqln'
- - 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBO4lGTjPONQe/nOy+aE756jTGGgWqKa/tpwhpSEQ0QrabbWH581CEDBERqeXZTrRxqmoVLHhJVfMa62v06SScO4='
- - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPoWK1RZ08u2VChuNsdaqq3XxTzSqp5npLvo+S3Iiu8K'
- gitea07.opendev.org:
- ansible_host: 38.108.68.134
- location:
- cloud: openstackci-vexxhost
- region_name: sjc1
- public_v4: 38.108.68.134
- public_v6: 2604:e100:3:0:f816:3eff:fe89:6d7a
- host_keys:
- - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDBxZbmfCjOia63XkVrCGmekb4W32qHXp5kQHPJTli55KStDiBz6hDDLopsraTgkCWX2Aix7PVe1ybv9rfaYDk0m0xhw1WrQbv3tHFijhM9fzjb51HLRJAaWBaEwsT4toMqOn1F56vCGYO2/DrY2VhBOP1TGMLMkBFjCDc03teB60rFLPLoR256mj6Y3mWAquV/NJdW3k+TLCY1TEB2TK6QF0qR5+BIMOnU4lA0onHRiJGVegmOGQYXj/ANee1Bl9+sxqALHNW1EsoJwbV2rfeCc4NNKGBftJoL1p609VUkjWUpeYN7KPpil9T5c3cX3TlFr7pXVkBDWecwu4xMwiVv'
- - 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBICHoAeyt0GjLtdzGPlImOrv74P3JBHoyJRn2v7RrC1aIBHwIfA2nGtfXsQm82+qn38R6qDRELnwqrBoC4FS/8Y='
- - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIERgzQ+ruKg/fo74ccgj1iUpz0yS7+LjR6u7JJ1ylTiK'
- gitea08.opendev.org:
- ansible_host: 38.108.68.205
- location:
- cloud: openstackci-vexxhost
- region_name: sjc1
- public_v4: 38.108.68.205
- public_v6: 2604:e100:3:0:f816:3eff:feef:a51d
- host_keys:
- - 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBISOjXFfpk01z2G4eQfksA9DQRi3PQyP4m2RUFz4lmsClHVS9cP6CfQF01KpIzkL4UXRu3u4QwCqno0DrXxKoqA='
- - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDOhcvWMusjlFfm+qqpP9Hfc+a2SKb+evz/h5AcAwElmyaes/BpmXsvXLMAXvDG0ZjPwUbyvVcJAwug77+fBI6JBt6BjlfqMTsxnwN1jVPug4fu7RSor4huBagiq6uTS8t1tXqwEfqzBvLOat4FNXsQpv1yIaORgjSj593GoixfWPvTzJHISFSB5TTeqrLK1XJ3LIWqL5PyHsBaKbL4SPIoHzX6HslUmxVpJ7m7U0VtcfnxylVsTnq3YHc8nAK+X4Fu1T7L+ertAwIlFlw5W9JppaUotP0m0Cr/CCUTVj79EfADGUJWSqdpPUET3wB7+cwalan5PKwoQVMHpIlFZYnd'
- - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBs08YhtJq4tVGqXv9sjc3NpsdQ1wBZAiocBC/RVpQSp'
gitea09.opendev.org:
ansible_host: 38.108.68.113
location:
diff --git a/inventory/service/host_vars/gitea05.opendev.org.yaml b/inventory/service/host_vars/gitea05.opendev.org.yaml
deleted file mode 100644
index 8f90cb44f6..0000000000
--- a/inventory/service/host_vars/gitea05.opendev.org.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-letsencrypt_certs:
- gitea05-main:
- - gitea05.opendev.org:3000
- - opendev.org
diff --git a/inventory/service/host_vars/gitea06.opendev.org.yaml b/inventory/service/host_vars/gitea06.opendev.org.yaml
deleted file mode 100644
index b8e6d4f3eb..0000000000
--- a/inventory/service/host_vars/gitea06.opendev.org.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-letsencrypt_certs:
- gitea06-main:
- - gitea06.opendev.org:3000
- - opendev.org
diff --git a/inventory/service/host_vars/gitea07.opendev.org.yaml b/inventory/service/host_vars/gitea07.opendev.org.yaml
deleted file mode 100644
index ebcc56f16c..0000000000
--- a/inventory/service/host_vars/gitea07.opendev.org.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-letsencrypt_certs:
- gitea07-main:
- - gitea07.opendev.org:3000
- - opendev.org
diff --git a/inventory/service/host_vars/gitea08.opendev.org.yaml b/inventory/service/host_vars/gitea08.opendev.org.yaml
deleted file mode 100644
index 64c34c4570..0000000000
--- a/inventory/service/host_vars/gitea08.opendev.org.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-letsencrypt_certs:
- gitea08-main:
- - gitea08.opendev.org:3000
- - opendev.org
diff --git a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml
index 3e16c8480f..44ccd05895 100644
--- a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml
+++ b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml
@@ -276,18 +276,6 @@
- name: letsencrypt updated gitea04-main
include_tasks: roles/letsencrypt-create-certs/handlers/restart_gitea.yaml
-- name: letsencrypt updated gitea05-main
- include_tasks: roles/letsencrypt-create-certs/handlers/restart_gitea.yaml
-
-- name: letsencrypt updated gitea06-main
- include_tasks: roles/letsencrypt-create-certs/handlers/restart_gitea.yaml
-
-- name: letsencrypt updated gitea07-main
- include_tasks: roles/letsencrypt-create-certs/handlers/restart_gitea.yaml
-
-- name: letsencrypt updated gitea08-main
- include_tasks: roles/letsencrypt-create-certs/handlers/restart_gitea.yaml
-
- name: letsencrypt updated gitea09-main
include_tasks: roles/letsencrypt-create-certs/handlers/restart_gitea.yaml