opendev/system-config
Code Issues Proposed changes

Merge "Replace OVH CI mirrors"

Browse Source
This commit is contained in:
Zuul 2020-05-13 01:12:00 +00:00 committed by Gerrit Code Review
commit 60b696da09
7 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hiera/common.yaml
View File

@ -282,9 +282,8 @@ cacti_hosts:
- mirror01.ca-ymq-1.vexxhost.openstack.org - mirror01.ca-ymq-1.vexxhost.openstack.org
- mirror02.ca-ymq-1.vexxhost.openstack.org - mirror02.ca-ymq-1.vexxhost.openstack.org
- mirror02.regionone.limestone.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.opendev.org
- mirror.gra1.ovh.openstack.org
- mirror.mtl01.inap.opendev.org - mirror.mtl01.inap.opendev.org
- mirror02.us-west-1.packethost.openstack.org - mirror02.us-west-1.packethost.openstack.org
- mirror01.regionone.linaro-us.opendev.org - mirror01.regionone.linaro-us.opendev.org

24
inventory/openstack.yaml
View File

@ -440,30 +440,18 @@ all:
region_name: DFW region_name: DFW
public_v4: 104.130.141.75 public_v4: 104.130.141.75
public_v6: 2001:4800:7818:103:be76:4eff:fe04:5f3a public_v6: 2001:4800:7818:103:be76:4eff:fe04:5f3a
mirror01.bhs1.ovh.openstack.org: mirror01.bhs1.ovh.opendev.org:
ansible_host: 158.69.80.87 ansible_host: 158.69.73.218
location: location:
cloud: openstackci-ovh cloud: openstackci-ovh
region_name: BHS1 region_name: BHS1
public_v4: 158.69.80.87 public_v4: 158.69.73.218
public_v6: 2607:5300:201:2000::c:5fa4 mirror02.gra1.ovh.opendev.org:
mirror01.gra1.ovh.opendev.org: ansible_host: 149.202.160.10
ansible_host: 149.202.161.140
location: location:
cloud: openstackci-ovh cloud: openstackci-ovh
region_name: GRA1 region_name: GRA1
public_v4: 149.202.161.140 public_v4: 149.202.160.10
# 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
mirror01.iad.rax.openstack.org: mirror01.iad.rax.openstack.org:
ansible_host: 2001:4802:7807:103:be76:4eff:fe20:53f8 ansible_host: 2001:4802:7807:103:be76:4eff:fe20:53f8
location: location:

1
modules/openstack_project/files/ssl_cert_check/ssldomains
View File

@ -29,6 +29,7 @@ horizon.openstack.org 443
insecure-ci-registry.opendev.org 5000 insecure-ci-registry.opendev.org 5000
keystone.openstack.org 443 keystone.openstack.org 443
mirror.dfw.rax.opendev.org 443 mirror.dfw.rax.opendev.org 443
mirror.bhs1.ovh.opendev.org
mirror.gra1.ovh.opendev.org mirror.gra1.ovh.opendev.org
mirror.mtl01.inap.opendev.org 443 mirror.mtl01.inap.opendev.org 443
mirror.ord.rax.opendev.org 443 mirror.ord.rax.opendev.org 443

4
playbooks/host_vars/mirror01.bhs1.ovh.opendev.org.yaml Normal file
View File

@ -0,0 +1,4 @@
letsencrypt_certs:
mirror01-bhs1-ovh-main:
- mirror01.bhs1.ovh.opendev.org
- mirror.bhs1.ovh.opendev.org

4
playbooks/host_vars/mirror01.gra1.ovh.opendev.org.yaml
View File

@ -1,4 +0,0 @@
letsencrypt_certs:
mirror01-gra1-ovh-main:
- mirror01.gra1.ovh.opendev.org
- mirror.gra1.ovh.opendev.org

4
playbooks/host_vars/mirror02.gra1.ovh.opendev.org.yaml Normal file
View File

@ -0,0 +1,4 @@
letsencrypt_certs:
mirror02-gra1-ovh-main:
- mirror02.gra1.ovh.opendev.org
- mirror.gra1.ovh.opendev.org

5
playbooks/roles/letsencrypt-create-certs/handlers/main.yaml
View File

@ -151,7 +151,10 @@
- name: letsencrypt updated mirror01-ord-rax-main - name: letsencrypt updated mirror01-ord-rax-main
include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml 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 include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml
- name: letsencrypt updated mirror01-regionone-linaro-us-main - name: letsencrypt updated mirror01-regionone-linaro-us-main