From ac2b661cf27bc81f1ea2ea60f48f6952cdd59b5e Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Thu, 22 Apr 2021 12:15:28 -0700 Subject: [PATCH] Add mirror02 to inmotion We are doing this so that we can cleanup the private network + floating IP setup that the existing mirror does. Once this new mirror is up and happy we can cname to it and then clean up the old mirror and its networking config. We do this in order to save an IP that the current private network router is consuming. Depends-On: https://review.opendev.org/c/opendev/zone-opendev.org/+/787628 Change-Id: I50c311087c6c28726e36913c7e081f3b3d0ee049 --- hiera/common.yaml | 1 + inventory/base/hosts.yaml | 6 ++++++ inventory/service/host_vars/bridge.openstack.org.yaml | 6 ------ .../host_vars/mirror02.iad3.inmotion.opendev.org.yaml | 4 ++++ playbooks/roles/letsencrypt-create-certs/handlers/main.yaml | 3 +++ 5 files changed, 14 insertions(+), 6 deletions(-) create mode 100644 inventory/service/host_vars/mirror02.iad3.inmotion.opendev.org.yaml diff --git a/hiera/common.yaml b/hiera/common.yaml index 26419ab4f9..d5d79bf1de 100644 --- a/hiera/common.yaml +++ b/hiera/common.yaml @@ -288,6 +288,7 @@ cacti_hosts: - mirror02.regionone.linaro-us.opendev.org - mirror01.regionone.osuosl.opendev.org - mirror01.iad3.inmotion.opendev.org +- mirror02.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 d4639799e7..cc31822e08 100644 --- a/inventory/base/hosts.yaml +++ b/inventory/base/hosts.yaml @@ -534,6 +534,12 @@ all: cloud: opendevci-inmotion region_name: iad3 public_v4: 173.231.253.123 + mirror02.iad3.inmotion.opendev.org: + ansible_host: 173.231.253.126 + location: + cloud: opendevci-inmotion + region_name: iad3 + public_v4: 173.231.253.126 nb01.opendev.org: ansible_host: 104.239.240.55 location: diff --git a/inventory/service/host_vars/bridge.openstack.org.yaml b/inventory/service/host_vars/bridge.openstack.org.yaml index 2266896475..c9b12552f2 100644 --- a/inventory/service/host_vars/bridge.openstack.org.yaml +++ b/inventory/service/host_vars/bridge.openstack.org.yaml @@ -348,12 +348,6 @@ cloud_launcher_clouds: profiles: - openstackci-keypairs - openstackci-security - - opendevci-networking - routers: - - name: opendevci-router1 - network: External - interfaces: - - opendevci-subnet1 - name: opendevzuul-inmotion oscc_cloud: opendevzuul-inmotion diff --git a/inventory/service/host_vars/mirror02.iad3.inmotion.opendev.org.yaml b/inventory/service/host_vars/mirror02.iad3.inmotion.opendev.org.yaml new file mode 100644 index 0000000000..edb2b69f92 --- /dev/null +++ b/inventory/service/host_vars/mirror02.iad3.inmotion.opendev.org.yaml @@ -0,0 +1,4 @@ +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 27bac6e0c2..8a3ad62754 100644 --- a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml +++ b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml @@ -200,6 +200,9 @@ - name: letsencrypt updated mirror01-iad3-inmotion-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