From a864212b1bb2e90d4a9286c0e1363569c30123ca Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Fri, 15 May 2020 09:39:05 +1000 Subject: [PATCH] Add vexxhost opendev.org mirrors These are to replace the puppet-based openstack.org mirrors Depends-On: https://review.opendev.org/728308 Change-Id: Ibdce99daa514fb445f1f8389e7c052ee151057ea --- hiera/common.yaml | 2 ++ inventory/openstack.yaml | 14 ++++++++++++++ .../files/ssl_cert_check/ssldomains | 2 ++ .../mirror01.ca-ymq-1.vexxhost.opendev.org | 4 ++++ .../host_vars/mirror01.sjc1.vexxhost.opendev.org | 4 ++++ .../letsencrypt-create-certs/handlers/main.yaml | 6 ++++++ 6 files changed, 32 insertions(+) create mode 100644 playbooks/host_vars/mirror01.ca-ymq-1.vexxhost.opendev.org create mode 100644 playbooks/host_vars/mirror01.sjc1.vexxhost.opendev.org diff --git a/hiera/common.yaml b/hiera/common.yaml index 9ade6e4645..d817580cd5 100644 --- a/hiera/common.yaml +++ b/hiera/common.yaml @@ -274,6 +274,8 @@ cacti_hosts: - mirror01.dfw.rax.opendev.org - mirror01.ord.rax.opendev.org - mirror01.iad.rax.opendev.org +- mirror01.ca-ymq-1.vexxhost.opendev.org +- mirror01.sjc1.vexxhost.opendev.org - mirror01.ca-ymq-1.vexxhost.openstack.org - mirror02.ca-ymq-1.vexxhost.openstack.org - mirror02.regionone.limestone.openstack.org diff --git a/inventory/openstack.yaml b/inventory/openstack.yaml index cf37f918bd..d292fb4279 100644 --- a/inventory/openstack.yaml +++ b/inventory/openstack.yaml @@ -480,6 +480,13 @@ all: region_name: ORD public_v4: 23.253.216.84 public_v6: 2001:4801:7824:103:be76:4eff:fe10:9c2 + mirror01.sjc1.vexxhost.opendev.org: + ansible_host: 2604:e100:3:0:f816:3eff:fee3:150 + location: + cloud: openstackci-vexxhost + region_name: sjc1 + public_v4: 38.108.68.25 + public_v6: 2604:e100:3:0:f816:3eff:fee3:150 mirror01.sjc1.vexxhost.openstack.org: ansible_host: 38.108.68.37 location: @@ -487,6 +494,13 @@ all: region_name: sjc1 public_v4: 38.108.68.37 public_v6: '' + mirror01.ca-ymq-1.vexxhost.opendev.org: + ansible_host: 2604:e100:1:0:f816:3eff:fe0c:e2c0 + location: + cloud: openstackci-vexxhost + region_name: ca-ymq-1 + public_v4: 199.204.45.149 + public_v6: 2604:e100:1:0:f816:3eff:fe0c:e2c0 mirror02.ca-ymq-1.vexxhost.openstack.org: ansible_host: 2604:e100:1:0:f816:3eff:fef6:cc49 location: diff --git a/modules/openstack_project/files/ssl_cert_check/ssldomains b/modules/openstack_project/files/ssl_cert_check/ssldomains index ec9a45c4ae..a5bbd9e0f0 100644 --- a/modules/openstack_project/files/ssl_cert_check/ssldomains +++ b/modules/openstack_project/files/ssl_cert_check/ssldomains @@ -36,6 +36,8 @@ mirror.mtl01.inap.opendev.org 443 mirror.ord.rax.opendev.org 443 mirror.regionone.linaro-us.opendev.org 443 mirror.us-east.openedge.opendev.org 443 +mirror.sjc1.vexxhost.opendev.org 443 +mirror.ca-ymq-1.vexxhost.opendev.org 443 nova.openstack.org 443 opendev.org 443 openstackid-dev.openstack.org 443 diff --git a/playbooks/host_vars/mirror01.ca-ymq-1.vexxhost.opendev.org b/playbooks/host_vars/mirror01.ca-ymq-1.vexxhost.opendev.org new file mode 100644 index 0000000000..08674b8db3 --- /dev/null +++ b/playbooks/host_vars/mirror01.ca-ymq-1.vexxhost.opendev.org @@ -0,0 +1,4 @@ +letsencrypt_certs: + mirror01-ca-ymq-1-vexxhost-main: + - mirror01.ca-ymq-1.vexxhost.opendev.org + - mirror.ca-ymq-1.vexxhost.opendev.org diff --git a/playbooks/host_vars/mirror01.sjc1.vexxhost.opendev.org b/playbooks/host_vars/mirror01.sjc1.vexxhost.opendev.org new file mode 100644 index 0000000000..51dd41adf0 --- /dev/null +++ b/playbooks/host_vars/mirror01.sjc1.vexxhost.opendev.org @@ -0,0 +1,4 @@ +letsencrypt_certs: + mirror01-sjc1-vexxhost-main: + - mirror01.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 4cd38dda11..44aa5862de 100644 --- a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml +++ b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml @@ -169,6 +169,12 @@ - name: letsencrypt updated mirror01-us-east-openedge-main include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml +- name: letsencrypt updated mirror01-sjc1-vexxhost-main + include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yam + +- name: letsencrypt updated mirror01-ca-ymq-1-vexxhost-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