Merge "Separate openafs CI mirror"

This commit is contained in:
Zuul 2019-06-25 06:47:32 +00:00 committed by Gerrit Code Review
commit 920dbd7584
7 changed files with 10 additions and 10 deletions

View File

@ -551,7 +551,7 @@
nodes:
- name: bridge.openstack.org
label: ubuntu-bionic
- name: mirror01.region.provider.opendev.org
- name: mirror01.openafs.provider.opendev.org
label: ubuntu-bionic
vars:
run_playbooks:

View File

@ -44,5 +44,5 @@
vars:
touch_file: '/tmp/letsencrypt02-main-service.stamp'
- name: letsencrypt updated mirror01-region-provider-opendev-org-main
- name: letsencrypt updated mirror01-openafs-provider-opendev-org-main
include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml

View File

@ -114,8 +114,8 @@
- name: Set mirror servername and alias
set_fact:
apache_server_name: '{{ inventory_hostname }}'
# Strip the numeric host value from mirror01.region.provider.o.o
# for the serveralias
# Strip the numeric host value (like mirror01.region.provider.o.o
# becomes mirror.region...) for the serveralias
apache_server_alias: '{{ inventory_hostname | regex_replace("^mirror\d\d\.", "mirror.") }}'
- name: Create mirror virtual host

View File

@ -82,7 +82,7 @@
- host_vars/bridge.openstack.org.yaml
- host_vars/letsencrypt01.opendev.org.yaml
- host_vars/letsencrypt02.opendev.org.yaml
- host_vars/mirror01.region.provider.opendev.org.yaml
- host_vars/mirror01.openafs.provider.opendev.org.yaml
- name: Display group membership
command: ansible localhost -m debug -a 'var=groups'
- name: Run base.yaml

View File

@ -8,4 +8,4 @@ groups:
letsencrypt:
- letsencrypt01.opendev.org
- letsencrypt02.opendev.org
- mirror01.region.provider.opendev.org
- mirror01.openafs.provider.opendev.org

View File

@ -0,0 +1,4 @@
letsencrypt_certs:
mirror01-openafs-provider-opendev-org-main:
- mirror01.openafs.provider.opendev.org
- mirror.openafs.provider.opendev.org

View File

@ -1,4 +0,0 @@
letsencrypt_certs:
mirror01-region-provider-opendev-org-main:
- mirror01.region.provider.opendev.org
- mirror.region.provider.opendev.org