From d33105535aa2dcc7d9aea65f0060e932344e4686 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Mon, 17 Jun 2019 11:15:38 +1000 Subject: [PATCH] Separate openafs CI mirror 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 --- .zuul.yaml | 2 +- playbooks/roles/letsencrypt-create-certs/handlers/main.yaml | 2 +- playbooks/roles/mirror/tasks/main.yaml | 4 ++-- playbooks/zuul/run-base.yaml | 2 +- playbooks/zuul/templates/gate-groups.yaml.j2 | 2 +- .../host_vars/mirror01.openafs.provider.opendev.org.yaml.j2 | 4 ++++ .../host_vars/mirror01.region.provider.opendev.org.yaml.j2 | 4 ---- 7 files changed, 10 insertions(+), 10 deletions(-) create mode 100644 playbooks/zuul/templates/host_vars/mirror01.openafs.provider.opendev.org.yaml.j2 delete mode 100644 playbooks/zuul/templates/host_vars/mirror01.region.provider.opendev.org.yaml.j2 diff --git a/.zuul.yaml b/.zuul.yaml index 915256a154..388d297a15 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -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: diff --git a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml index ee9d87879f..7b743a513a 100644 --- a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml +++ b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml @@ -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 diff --git a/playbooks/roles/mirror/tasks/main.yaml b/playbooks/roles/mirror/tasks/main.yaml index 4fa2c32c6f..dc8bb909a6 100644 --- a/playbooks/roles/mirror/tasks/main.yaml +++ b/playbooks/roles/mirror/tasks/main.yaml @@ -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 diff --git a/playbooks/zuul/run-base.yaml b/playbooks/zuul/run-base.yaml index bef44feab7..10a918324b 100644 --- a/playbooks/zuul/run-base.yaml +++ b/playbooks/zuul/run-base.yaml @@ -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 diff --git a/playbooks/zuul/templates/gate-groups.yaml.j2 b/playbooks/zuul/templates/gate-groups.yaml.j2 index fbecbbc3e8..bbf67fdac0 100644 --- a/playbooks/zuul/templates/gate-groups.yaml.j2 +++ b/playbooks/zuul/templates/gate-groups.yaml.j2 @@ -8,4 +8,4 @@ groups: letsencrypt: - letsencrypt01.opendev.org - letsencrypt02.opendev.org - - mirror01.region.provider.opendev.org + - mirror01.openafs.provider.opendev.org diff --git a/playbooks/zuul/templates/host_vars/mirror01.openafs.provider.opendev.org.yaml.j2 b/playbooks/zuul/templates/host_vars/mirror01.openafs.provider.opendev.org.yaml.j2 new file mode 100644 index 0000000000..337fe5f0bd --- /dev/null +++ b/playbooks/zuul/templates/host_vars/mirror01.openafs.provider.opendev.org.yaml.j2 @@ -0,0 +1,4 @@ +letsencrypt_certs: + mirror01-openafs-provider-opendev-org-main: + - mirror01.openafs.provider.opendev.org + - mirror.openafs.provider.opendev.org diff --git a/playbooks/zuul/templates/host_vars/mirror01.region.provider.opendev.org.yaml.j2 b/playbooks/zuul/templates/host_vars/mirror01.region.provider.opendev.org.yaml.j2 deleted file mode 100644 index 083952b24c..0000000000 --- a/playbooks/zuul/templates/host_vars/mirror01.region.provider.opendev.org.yaml.j2 +++ /dev/null @@ -1,4 +0,0 @@ -letsencrypt_certs: - mirror01-region-provider-opendev-org-main: - - mirror01.region.provider.opendev.org - - mirror.region.provider.opendev.org