From f20a6ed15812e4ce676e734bf446033949b3701c Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Wed, 12 Mar 2025 13:00:50 -0700
Subject: [PATCH] Replace mirror02 with mirror03 in vexxhost regions
The mirror02 mirrors were booted on flavors that were much larger than
necessary and didn't have external volumes attached for teh cache
content. I've gone ahead and booted replacement Noble nodes using a
smaller flavor naming them mirror03 and attached a volume to each one
for caching.
We pull mirror02 out of the inventory as we don't need it anymore
(mirror01 is in use in production and will be cleaned up in followups).
Depends-On: https://review.opendev.org/c/opendev/zone-opendev.org/+/944150
Change-Id: Ice9b4e79bfde5a8364d084c7434b848805d8ecfd
---
inventory/base/hosts.yaml | 28 +++++++++----------
...irror02.ca-ymq-1.vexxhost.opendev.org.yaml | 4 ---
.../mirror02.sjc1.vexxhost.opendev.org.yaml | 4 ---
...irror03.ca-ymq-1.vexxhost.opendev.org.yaml | 4 +++
.../mirror03.sjc1.vexxhost.opendev.org.yaml | 4 +++
.../handlers/main.yaml | 4 +--
6 files changed, 24 insertions(+), 24 deletions(-)
delete mode 100644 inventory/service/host_vars/mirror02.ca-ymq-1.vexxhost.opendev.org.yaml
delete mode 100644 inventory/service/host_vars/mirror02.sjc1.vexxhost.opendev.org.yaml
create mode 100644 inventory/service/host_vars/mirror03.ca-ymq-1.vexxhost.opendev.org.yaml
create mode 100644 inventory/service/host_vars/mirror03.sjc1.vexxhost.opendev.org.yaml
diff --git a/inventory/base/hosts.yaml b/inventory/base/hosts.yaml
index b961ddffe3..9a3f4dec19 100644
--- a/inventory/base/hosts.yaml
+++ b/inventory/base/hosts.yaml
@@ -437,17 +437,17 @@ all:
- 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJGA25LxwhgyeGk6D4ter2Ak38iXL0F30jPol4AIR60F'
- 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDNh7pgkpOdv+529JuPj+k9o0qHNWhSaRk0V0BuAJlCgDoNlV69Cq1Y+hXTwbx7lnoSas71SzvYSoImowZCPxd+yUHC73E/QrWT5oVnKguSC8L3ZIawk7FMCiJNK8dZkmgUo1uTpWG0rNzXWoKEHJYdpMQd2g3+GdNV6X7RWKLCOpV6WgJ5N1+5f3l1l/Z7XDrpw6O3wFKC3TjjydDtGn9zdiRNcCC1/eN1Ep134rxjjcXjMZf+wf7osWcQftLuph6In/oZpWDZMO33YLfI2Yf0uO1lKkcX7KGijwTngn7qzrCABUtlrTu/pEYbA44eBAhYskVHCpeeKis0CL0FVNt7zAuMmz8qMV7lirh1E2hun2w6b3S15sKomrJ69lzBJnsGI/Kx05LUDQXfIXZ5NKA25mouKFfDpLNRyv6lBliz9agAbfa3Pmz6fvshPpFb+DJS+mxaz/wJb6XD9R7uK3odG1wnZy0xhThiojnJ9XhHIXBTNBPKwwR86h+Mp/wK81s='
- 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLBlVqQ4zGMui/T296Y1uF+2xQcUUSVg2TaX4XIWmpvHuPDgw1T4BAV7UFd8CKLCOSFQrrNGvL4MkmufHg9d1ig='
- mirror02.sjc1.vexxhost.opendev.org:
- ansible_host: 38.108.68.60
+ mirror03.sjc1.vexxhost.opendev.org:
+ ansible_host: 38.108.68.192
location:
cloud: openstackci-vexxhost
region_name: sjc1
- public_v4: 38.108.68.60
- public_v6: 2604:e100:3:0:f816:3eff:fe09:6ac5
+ public_v4: 38.108.68.192
+ public_v6: 2604:e100:3:0:f816:3eff:fe72:981c
host_keys:
- - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCd9Vm1oIoXTAnSJJ2TkSycN1D1U9qRlUgeLeV8IR5kUd3VdForRsvB4YV3gaKqVJAUc2zpjPn3rWI/0a+01yWh07U/ffcqGb//W5bUE4WeRFkcQAJsZjkPHXWVkc1JHHaQayI3oUNSVoAg85iXKypZXBvMgayrzIFMkbdNL7nBA7bsBD2yosV358SodX12QGPZJnEpMjsOb1gggJ24E5dVT+IZxUjekSWcBtH8m6yST8dqSPgjy8XrSTrrCTV4a0AfzwXKQ+gSvk5yLzYdOCQgnKfjLp5dzb3JXqfstQ0Yg5zfuxMzyuISw7H+okseEc+AsXrVfXSOI7o7idc+B0UjucmUD2GRt3f3RDwpro8W3+pGlSzRbvHYhDZUTTx/pcPbhuS4A53eSFAeIaO1zdK4QSOvdiddfpc+SxMocvwoWTNK6hk6zpluC8VBRke7giAGv5UvSxFnPwQSw3IQK253SPbtBvWNtXdD642JYX6L+T9bMdjVxP0/gPuEB+0j/Ys='
- - 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBM7QNJQKqza26ksDdysBbdIW+tQ9ff2qR3EW/x7ASen+BBFLXW2Mep20IK7ky2MgRZ9C/SxRGLHRnvlRTlXirBw='
- - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIiAmkZUu0NNgW9hASJFgtEGjcCoqcJJsUShDZN8a8ty'
+ - 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBDNIqS8NU0/ItlNCweGlgii0aa6ha4EYdXXv82SB5asGp2mEosWoRd4pM/8zkb4M+MYk+ReUxu/6eY0p1rNQR7k='
+ - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDASN+7fxQUtWzIAfB76ZwYy0k7Px6elBlSjf9Vdvnb8OI8BWQm4YiaIxBiwJLsk2CrCTAyiLvGVeHYbxdFzAqhjhHzQT+Gyp47AeaBbizFNjOzSF0ToEwnlN38VRc1VpsO8l9PACoFs4dFUMrt3Sz2tj1x2rUsgLl2x+DHP9hRE21zv4bZ8O+f5iKzHJcRfWbJCmDEONjo+OQG+4FciFvDhZp/UsmTH/Z+wl8dIj5RLFCuTE4C1T+oeAoC8qZuMWQL3HVB1hdnmLth4FQMUDDk0BHzwQH6V3XE94szlatQRQmtS4zGfFKmEdgmfNyOH9bp9Qzj7moNMg7UfXjY6mNa/FjrR0T/5gBXNl1AkxJzbNXJDCzqfd5DTtd4/ELBgzmSQ0m2GmM/xix7SnlGeDc653qj+SpV8S76JBhH4Gc434LbbPi81FnGBO9XI33icvuQg1ABfiGwiMGKD/c78w3rQMfDI+Q6VS2lSNdkCk0XSMbXymION74t0pKXeJPWjrc='
+ - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICQRuwj1+lI2meH8pw1CfgAPw/83XISUnihZ3V7Kq0oJ'
mirror01.ca-ymq-1.vexxhost.opendev.org:
ansible_host: 199.204.45.149
location:
@@ -459,17 +459,17 @@ all:
- 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDAZeE2byPrnjtUyljhaGwmdKz/wV4mMdaW+X5DYXWj1My7BQqmkYfNTiI4X6chwuoXxjc+JQBuoVVoWkwGgQqynjVvot2GA6ujY4q49mu0pGCSVR8hMz69Gq8tT1OU1eHKNZWb2KroH2uEiz3IVPdPnRqZ7woSk8IZ0NnGIW0C4dUT/HLNkGX2hbEb30mad1VL2UF0krKVvsB73jl4/fz68/7e0JvaHqt/14ogdgnqgdnJiNNr+MktM2EkRd3AF+lbPIh/cc1aIVQpU25zdrMrrOsOrAGcerob5cY+b8Wx5ibQsXMRXcJxZ1nBGSc/yW5ONKQhBAgTqwPW/BLlBAAVO8mbiN404tF+Bhh89SOAj/UwsHUntTTEAcieQMIAdoD2em+PjWCsA58qux3LnjkIevWnGVf5OeZEoFtTITQP9ZRlsX6oJrelf0lB2IVjXTivwvXvmucpj/X7PjCuM+jFxioSAxfwsrD2mXtHJevLnTgeiaQG/l1rHxudKHoyB48='
- 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEof21svCuQM4z4Osx6h6Mbzik72h35Qkw0mye/8q7cf1cpelhlZ8F0U4FTE+pH422qETVIvSBtEtIEeGMDr4bs='
- 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBZmkSB1SxUHTf1fxA94ToI7NVp8j3b0aTPY9tEz/KZj'
- mirror02.ca-ymq-1.vexxhost.opendev.org:
- ansible_host: 199.19.213.142
+ mirror03.ca-ymq-1.vexxhost.opendev.org:
+ ansible_host: 162.253.55.232
location:
cloud: openstackci-vexxhost
region_name: ca-ymq-1
- public_v4: 199.19.213.142
- public_v6: 2604:e100:1:0:f816:3eff:feb6:2784
+ public_v4: 162.253.55.232
+ public_v6: 2604:e100:1:0:f816:3eff:fef9:1d9c
host_keys:
- - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC3/xwBR/m1dnc4dEArbNOSaCdJXXX4brVOq6AaRPTedVIVkdZFHYx97uIVSZJZ9bSD0DEiEowTVqLAa0YYOETNzjbvBXgXloN94EooQlRM9avndw0vXUNQqdtbSsMOMCEipfET8KLNdo7YcGRuq0bTyZ+A3oEL/bcxG/lJfaz/3MPfTjxL6LXy1K+cb2VhE1NUkGXJHgKmzx1z3Yb5sin0IO+GeH0ZW7mCAZ6vXR3wIg+qMGoajSBJ1HJX2FXFeNs9v6BmS6dNi2GWxGrQkReacjlNeUlV+yzIJm+CuKsKMvIlz0TBGPK5rnRbHoXLB2Qgn7cGkkHz9i8THS6kY25J9B+foCuWKv0Z7X8PYgo67gtJ8aSaa6PtKNycT6m+om7YWYMuvsLsHvaZ1ZFanBwkUfb2K0+NyOd4EeqQHiK08plK0+041m6vwRHqZFNgnNz8MQBXmR5XjdkLsEY76sjOUi2z8jtJWjF6WOqDeqOkr4B6i4LLyPQes0GiMEiAHBE='
- - 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBMbbKeuujE2XsmADsPkmmLWAW0NATpDCrTZ68Ai6hNj4lFT6gCJaP3QCC9hR1Zy0OKKBVveo9vMFG7Q3FWNcsAo='
- - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIPUCmQOlIiiwn4NRWUOOhRR+mtAYo9ZYNaFYDV6pZzs'
+ - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO117xNgPs6Vqel4mlkQd4/0mhY8g7tlxd7oj0MDqoSF'
+ - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDFeoIxFxUOVk91zdN5DM8/PFGoZY3zKXEm5JIT0Hu5wNFWkdmE/NKIJSLJydwIexwcDVmJfYpzTcbXj5k88VJzj7i5M8xnX/krtWV2I9fwYgMd1OiMjCwK70GdTAtNTYmBUfqOnatvZPO6XsCvM9U+9vnd2vj+89Wrvy+M/z9xGCXQ8xaycsm20Ukm7sNLPD1IiD+3tTDdvIo2qIyTlPh6ZaH1MkKEiR3aviQvEKGm84PB+hmdrQ1fhN8Yqw+pcujz4Tcl00XZjnMkBJLydBHYO0TKSLG+RfTnqdG6LsMHbIHxV2bz3WXFjp2zIPa59CYYAXtRnu5Yks+1TgbzT/yksBYKXR4/kwQKrpMWPuDCsNnzYZZ/2uqL46So2z/BIAZiPz6snZwsUrfoO7X+gRS+joz55jSF46rK/qkyM/jlLvCKxt1AIA3GpooW7uxm/kIIPz4VRA1biBWfNhZDHH7eYrZVKdwmCVgvWFM+dHyQ165E83MOFLkmruvebH2IvyE='
+ - 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBMEJdJ+9qgL3+/VzH0nHzlneTgYGvxh4yUd8tFgjOZ+wgQcAfw+JRDvvXRUfUSEduvmktiUE0gcc9dHAdy3DTg8='
mirror02.dfw.rax.opendev.org:
ansible_host: 104.130.140.186
location:
diff --git a/inventory/service/host_vars/mirror02.ca-ymq-1.vexxhost.opendev.org.yaml b/inventory/service/host_vars/mirror02.ca-ymq-1.vexxhost.opendev.org.yaml
deleted file mode 100644
index b183d2222f..0000000000
--- a/inventory/service/host_vars/mirror02.ca-ymq-1.vexxhost.opendev.org.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-letsencrypt_certs:
- mirror02-ca-ymq-1-vexxhost-main:
- - mirror02.ca-ymq-1.vexxhost.opendev.org
- - mirror.ca-ymq-1.vexxhost.opendev.org
diff --git a/inventory/service/host_vars/mirror02.sjc1.vexxhost.opendev.org.yaml b/inventory/service/host_vars/mirror02.sjc1.vexxhost.opendev.org.yaml
deleted file mode 100644
index c5dfd0ed76..0000000000
--- a/inventory/service/host_vars/mirror02.sjc1.vexxhost.opendev.org.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-letsencrypt_certs:
- mirror02-sjc1-vexxhost-main:
- - mirror02.sjc1.vexxhost.opendev.org
- - mirror.sjc1.vexxhost.opendev.org
diff --git a/inventory/service/host_vars/mirror03.ca-ymq-1.vexxhost.opendev.org.yaml b/inventory/service/host_vars/mirror03.ca-ymq-1.vexxhost.opendev.org.yaml
new file mode 100644
index 0000000000..7a994c6f4f
--- /dev/null
+++ b/inventory/service/host_vars/mirror03.ca-ymq-1.vexxhost.opendev.org.yaml
@@ -0,0 +1,4 @@
+letsencrypt_certs:
+ mirror03-ca-ymq-1-vexxhost-main:
+ - mirror03.ca-ymq-1.vexxhost.opendev.org
+ - mirror.ca-ymq-1.vexxhost.opendev.org
diff --git a/inventory/service/host_vars/mirror03.sjc1.vexxhost.opendev.org.yaml b/inventory/service/host_vars/mirror03.sjc1.vexxhost.opendev.org.yaml
new file mode 100644
index 0000000000..d3f00b0a5f
--- /dev/null
+++ b/inventory/service/host_vars/mirror03.sjc1.vexxhost.opendev.org.yaml
@@ -0,0 +1,4 @@
+letsencrypt_certs:
+ mirror03-sjc1-vexxhost-main:
+ - mirror03.sjc1.vexxhost.opendev.org
+ - mirror.sjc1.vexxhost.opendev.org
diff --git a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml
index fb166ae19b..6e13aa5ab2 100644
--- a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml
+++ b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml
@@ -212,13 +212,13 @@
- name: letsencrypt updated mirror01-sjc1-vexxhost-main
include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml
-- name: letsencrypt updated mirror02-sjc1-vexxhost-main
+- name: letsencrypt updated mirror03-sjc1-vexxhost-main
include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml
- name: letsencrypt updated mirror01-ca-ymq-1-vexxhost-main
include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml
-- name: letsencrypt updated mirror02-ca-ymq-1-vexxhost-main
+- name: letsencrypt updated mirror03-ca-ymq-1-vexxhost-main
include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml
- name: letsencrypt updated mirror01-regionone-osuosl-main