From 998e634e2bf159ef0e33afcd97dd7e522e398f24 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Fri, 21 Mar 2025 08:55:31 -0700
Subject: [PATCH] Add new mirror in osuosl
This is a new Noble mirror that will replace the old mirror. We update
the inventory test cases to stop matching the old mirror because that
old mirror will eventually be removed from the inventory. Otherwise this
is a pretty standard mirror replacement.
Depends-On: https://review.opendev.org/c/opendev/zone-opendev.org/+/945230
Change-Id: Ib18d834e16ebeec75fb7f16e1dc83b357efb646c
---
inventory/base/hosts.yaml | 10 ++++++++++
.../mirror02.regionone.osuosl.opendev.org.yaml | 4 ++++
.../files/inventory_plugins/test-fixtures/results.yaml | 2 +-
.../roles/letsencrypt-create-certs/handlers/main.yaml | 3 +++
4 files changed, 18 insertions(+), 1 deletion(-)
create mode 100644 inventory/service/host_vars/mirror02.regionone.osuosl.opendev.org.yaml
diff --git a/inventory/base/hosts.yaml b/inventory/base/hosts.yaml
index 96fa0a376a..e4f089f7c7 100644
--- a/inventory/base/hosts.yaml
+++ b/inventory/base/hosts.yaml
@@ -469,6 +469,16 @@ 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.regionone.osuosl.opendev.org:
+ ansible_host: 140.211.167.78
+ location:
+ cloud: opendevci-osuosl
+ region_name: RegionOne
+ public_v4: 140.211.167.78
+ host_keys:
+ - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINCxKcE6AKJTPsgmDdJVD+/bewOyM9THTW62Onv+OxJM'
+ - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDGgCoZLTHJ5q7x6tOz68muIFLoh2wikwds4WQelAHvJ5D8pC9Zjmn3pmhO+uSyQo87yPFDupg4/6BC0+51SdVgRMWGe0hfYb9FF7Vu51lgTFJ0AICaWWrrpi7rKzFSRG/I0RHPF1mdudoQGhNVRxs9V2eheNZzLL52wJ+Pcq5IQx7VCYqh0Y8Kac38i2h9F7AbMCAnpO8OZEUbX4vrhA+XL9uzsAyYrZPlynjdP/gK7PLi8XZydkQSSinwzVTGh1yv1Z0xkkuJtViw5AGvoshb7XX4tvohC7Ne8uehbwQIZauzkG+BQ8tINhuW5K4EFFlVHBOsaDFOVlYjqyEIM+H+//zCZVnG2PO2rzSR1d2qQhAIy+iX8dggW7F2L3P57MMxWWsblRlH87I6seg1p+C/ivQbzhrLBXNhing/nR4YU7VCry1Y1wZ6q8JUJufbSaxpwo9r4Spojim9AgPhC8TUvmx6QpXi2c0JJpb4iWR66beKlPCjWt6ToFPvEEOouh8='
+ - 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBAHeZ7L8h8jOKqYya0dn5SC/n6NhnvZKcDUzovXZHLk9M60Bq3wwfg6kEL/DMa467TAQIV3qdrlljRvev8T0JZM='
nb05.opendev.org:
ansible_host: 104.130.253.28
location:
diff --git a/inventory/service/host_vars/mirror02.regionone.osuosl.opendev.org.yaml b/inventory/service/host_vars/mirror02.regionone.osuosl.opendev.org.yaml
new file mode 100644
index 0000000000..4e8bbfc8d0
--- /dev/null
+++ b/inventory/service/host_vars/mirror02.regionone.osuosl.opendev.org.yaml
@@ -0,0 +1,4 @@
+letsencrypt_certs:
+ mirror02-regionone-osuosl-main:
+ - mirror02.regionone.osuosl.opendev.org
+ - mirror.regionone.osuosl.opendev.org
diff --git a/playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/results.yaml b/playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/results.yaml
index e0a196e152..22aceeb4a3 100644
--- a/playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/results.yaml
+++ b/playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/results.yaml
@@ -22,7 +22,7 @@ results:
- letsencrypt
- webservers
- mirror01.regionone.osuosl.opendev.org:
+ mirror02.regionone.osuosl.opendev.org:
- afs-client
- kerberos-client
- letsencrypt
diff --git a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml
index 88ecf855c6..1f6bdb99e5 100644
--- a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml
+++ b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml
@@ -218,6 +218,9 @@
- name: letsencrypt updated mirror01-regionone-osuosl-main
include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml
+- name: letsencrypt updated mirror02-regionone-osuosl-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