opendev/system-config
Code Issues Proposed changes

Separate openafs CI mirror

Browse Source 
This is an intermediate step to having both kafs and openafs testing
in the gate; this just makes it clear which host is which.

Change-Id: I8cd006227ed47ad5f2c5eec664083477dd7ba397
This commit is contained in:
Ian Wienand 2019-06-17 11:15:38 +10:00
parent 36d9687b4a
commit d33105535a
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.zuul.yaml
View File

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

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

@ -44,5 +44,5 @@
vars: vars:
touch_file: '/tmp/letsencrypt02-main-service.stamp' 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 include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml

4
playbooks/roles/mirror/tasks/main.yaml
View File

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

2
playbooks/zuul/run-base.yaml
View File

@ -82,7 +82,7 @@
- host_vars/bridge.openstack.org.yaml - host_vars/bridge.openstack.org.yaml
- host_vars/letsencrypt01.opendev.org.yaml - host_vars/letsencrypt01.opendev.org.yaml
- host_vars/letsencrypt02.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 - name: Display group membership
command: ansible localhost -m debug -a 'var=groups' command: ansible localhost -m debug -a 'var=groups'
- name: Run base.yaml - name: Run base.yaml

2
playbooks/zuul/templates/gate-groups.yaml.j2
View File

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

4
playbooks/zuul/templates/host_vars/mirror01.openafs.provider.opendev.org.yaml.j2 Normal file
View File

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

4
playbooks/zuul/templates/host_vars/mirror01.region.provider.opendev.org.yaml.j2
View File

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