From 31acca81d71dd5001dce106819597d06dabde4b0 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Tue, 12 May 2020 19:10:21 +0000 Subject: [PATCH] Replace OVH CI mirrors New opendev.org CI mirrors for OVH regions. The old BHS1 mirror was in the openstack.org domain, so is added new. There was an old GRA1 mirror in the opendev.org domain, so remote it and increment the ordinal in its short hostname to avoid a collision in the inventory cache. This is being done to switch to un-billed flavors in this provider, to simplify internal billing for their donation of resources. Change-Id: I05770856b5704aa438ed6bc54ec42ba9efb5cd2a --- hiera/common.yaml | 3 +-- inventory/openstack.yaml | 24 +++++-------------- .../files/ssl_cert_check/ssldomains | 1 + .../mirror01.bhs1.ovh.opendev.org.yaml | 4 ++++ .../mirror01.gra1.ovh.opendev.org.yaml | 4 ---- .../mirror02.gra1.ovh.opendev.org.yaml | 4 ++++ .../handlers/main.yaml | 5 +++- 7 files changed, 20 insertions(+), 25 deletions(-) create mode 100644 playbooks/host_vars/mirror01.bhs1.ovh.opendev.org.yaml delete mode 100644 playbooks/host_vars/mirror01.gra1.ovh.opendev.org.yaml create mode 100644 playbooks/host_vars/mirror02.gra1.ovh.opendev.org.yaml diff --git a/hiera/common.yaml b/hiera/common.yaml index a43c75e22d..09e2540a8f 100644 --- a/hiera/common.yaml +++ b/hiera/common.yaml @@ -282,9 +282,8 @@ cacti_hosts: - mirror01.ca-ymq-1.vexxhost.openstack.org - mirror02.ca-ymq-1.vexxhost.openstack.org - mirror02.regionone.limestone.openstack.org -- mirror.bhs1.ovh.openstack.org +- mirror.bhs1.ovh.opendev.org - mirror.gra1.ovh.opendev.org -- mirror.gra1.ovh.openstack.org - mirror.mtl01.inap.opendev.org - mirror02.us-west-1.packethost.openstack.org - mirror01.regionone.linaro-us.opendev.org diff --git a/inventory/openstack.yaml b/inventory/openstack.yaml index 913067f9c3..89d2c44907 100644 --- a/inventory/openstack.yaml +++ b/inventory/openstack.yaml @@ -440,30 +440,18 @@ all: region_name: DFW public_v4: 104.130.141.75 public_v6: 2001:4800:7818:103:be76:4eff:fe04:5f3a - mirror01.bhs1.ovh.openstack.org: - ansible_host: 158.69.80.87 + mirror01.bhs1.ovh.opendev.org: + ansible_host: 158.69.73.218 location: cloud: openstackci-ovh region_name: BHS1 - public_v4: 158.69.80.87 - public_v6: 2607:5300:201:2000::c:5fa4 - mirror01.gra1.ovh.opendev.org: - ansible_host: 149.202.161.140 + public_v4: 158.69.73.218 + mirror02.gra1.ovh.opendev.org: + ansible_host: 149.202.160.10 location: cloud: openstackci-ovh region_name: GRA1 - public_v4: 149.202.161.140 - # Note: assigned, but not setup as it needs to be manually - # applied; info is not provided to server metadata for - # auto configuration. - #public_v6: 2001:41d0:302:1000::f1f - mirror01.gra1.ovh.openstack.org: - ansible_host: 147.135.133.8 - location: - cloud: openstackci-ovh - region_name: GRA1 - public_v4: 147.135.133.8 - public_v6: 2001:41d0:302:1000::7:e357 + public_v4: 149.202.160.10 mirror01.iad.rax.openstack.org: ansible_host: 2001:4802:7807:103:be76:4eff:fe20:53f8 location: diff --git a/modules/openstack_project/files/ssl_cert_check/ssldomains b/modules/openstack_project/files/ssl_cert_check/ssldomains index 15454b0e54..4812e510e9 100644 --- a/modules/openstack_project/files/ssl_cert_check/ssldomains +++ b/modules/openstack_project/files/ssl_cert_check/ssldomains @@ -29,6 +29,7 @@ horizon.openstack.org 443 insecure-ci-registry.opendev.org 5000 keystone.openstack.org 443 mirror.dfw.rax.opendev.org 443 +mirror.bhs1.ovh.opendev.org mirror.gra1.ovh.opendev.org mirror.mtl01.inap.opendev.org 443 mirror.ord.rax.opendev.org 443 diff --git a/playbooks/host_vars/mirror01.bhs1.ovh.opendev.org.yaml b/playbooks/host_vars/mirror01.bhs1.ovh.opendev.org.yaml new file mode 100644 index 0000000000..4f237fcedd --- /dev/null +++ b/playbooks/host_vars/mirror01.bhs1.ovh.opendev.org.yaml @@ -0,0 +1,4 @@ +letsencrypt_certs: + mirror01-bhs1-ovh-main: + - mirror01.bhs1.ovh.opendev.org + - mirror.bhs1.ovh.opendev.org diff --git a/playbooks/host_vars/mirror01.gra1.ovh.opendev.org.yaml b/playbooks/host_vars/mirror01.gra1.ovh.opendev.org.yaml deleted file mode 100644 index b4271d6a92..0000000000 --- a/playbooks/host_vars/mirror01.gra1.ovh.opendev.org.yaml +++ /dev/null @@ -1,4 +0,0 @@ -letsencrypt_certs: - mirror01-gra1-ovh-main: - - mirror01.gra1.ovh.opendev.org - - mirror.gra1.ovh.opendev.org diff --git a/playbooks/host_vars/mirror02.gra1.ovh.opendev.org.yaml b/playbooks/host_vars/mirror02.gra1.ovh.opendev.org.yaml new file mode 100644 index 0000000000..6f858cfd1d --- /dev/null +++ b/playbooks/host_vars/mirror02.gra1.ovh.opendev.org.yaml @@ -0,0 +1,4 @@ +letsencrypt_certs: + mirror02-gra1-ovh-main: + - mirror02.gra1.ovh.opendev.org + - mirror.gra1.ovh.opendev.org diff --git a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml index 9114075dd7..a9d85f5621 100644 --- a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml +++ b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml @@ -151,7 +151,10 @@ - name: letsencrypt updated mirror01-ord-rax-main include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml -- name: letsencrypt updated mirror01-gra1-ovh-main +- name: letsencrypt updated mirror01-bhs1-ovh-main + include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml + +- name: letsencrypt updated mirror02-gra1-ovh-main include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml - name: letsencrypt updated mirror01-regionone-linaro-us-main