opendev/system-config
Code Issues Proposed changes

Merge "Add a jammy test node for regional mirrors"

Browse Source
This commit is contained in:
Zuul 2023-11-01 22:21:40 +00:00 committed by Gerrit Code Review
commit f1c7d7a8de
6 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -238,6 +238,9 @@
- name: letsencrypt updated mirror02-openafs-provider-opendev-org-main
include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml
- name: letsencrypt updated mirror03-openafs-provider-opendev-org-main
include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml
- name: letsencrypt updated gitea99-main
include_tasks: roles/letsencrypt-create-certs/handlers/restart_gitea.yaml

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

@ -146,6 +146,7 @@
- host_vars/grafana01.opendev.org.yaml
- host_vars/mirror01.openafs.provider.opendev.org.yaml
- host_vars/mirror02.openafs.provider.opendev.org.yaml
- host_vars/mirror03.openafs.provider.opendev.org.yaml
- host_vars/mirror-update99.opendev.org.yaml
- host_vars/paste99.opendev.org.yaml
- host_vars/refstack01.openstack.org.yaml

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

@ -13,6 +13,7 @@ groups:
- letsencrypt02.opendev.org
- mirror01.openafs.provider.opendev.org
- mirror02.openafs.provider.opendev.org
- mirror03.openafs.provider.opendev.org
borg-backup-server:
- borg-backup01.region.provider.opendev.org

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

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

3
testinfra/test_mirror.py
View File

@ -17,7 +17,8 @@ import json
testinfra_hosts = ['mirror01.openafs.provider.opendev.org',
'mirror02.openafs.provider.opendev.org']
'mirror02.openafs.provider.opendev.org',
'mirror03.openafs.provider.opendev.org']
def test_apache(host):
apache = host.service('apache2')

7
zuul.d/system-config-run.yaml
View File

@ -472,6 +472,11 @@
'/var/log/apache2/': logs
'/var/log/acme.sh': logs
'/etc/apache2/sites-available/mirror.conf': logs
mirror03.openafs.provider.opendev.org:
host_copy_output:
'/var/log/apache2/': logs
'/var/log/acme.sh': logs
'/etc/apache2/sites-available/mirror.conf': logs
files:
- playbooks/bootstrap-bridge.yaml
- roles/
@ -494,6 +499,8 @@
label: ubuntu-bionic
- name: mirror02.openafs.provider.opendev.org
label: ubuntu-focal
- name: mirror03.openafs.provider.opendev.org
label: ubuntu-jammy
groups:
- <<: *bastion_group