opendev
/
system-config
Code Issues Proposed changes

Merge "Clean up zuul01 from inventory"

This commit is contained in:
Zuul 2021-05-13 23:09:53 +00:00 committed by Gerrit Code Review
parent f75cf08a5a c743b7e484
commit 6aab5d7013
7 changed files with 11 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hiera/common.yaml
View File

@ -321,7 +321,6 @@ cacti_hosts:
- zm06.opendev.org
- zm07.opendev.org
- zm08.opendev.org
- zuul01.openstack.org
- zuul02.opendev.org
statusbot_auth_nicks:
- jeblair

7
inventory/base/hosts.yaml
View File

@ -878,13 +878,6 @@ all:
region_name: DFW
public_v4: 104.130.126.45
public_v6: 2001:4800:7818:104:be76:4eff:fe04:6180
zuul01.openstack.org:
ansible_host: 104.130.246.196
location:
cloud: openstackci-rax
region_name: DFW
public_v4: 104.130.246.196
public_v6: 2001:4800:7819:103:be76:4eff:fe04:5870
zuul02.opendev.org:
ansible_host: 104.130.246.31
location:

4
inventory/service/group_vars/zuul.yaml
View File

@ -5,9 +5,7 @@ zuul_group: zuuld
zuul_known_hosts: |
[review.opendev.org]:29418,[review.openstack.org]:29418,[104.130.246.32]:29418,[2001:4800:7819:103:be76:4eff:fe04:9229]:29418 {{ gerrit_ssh_rsa_pubkey_contents }}
[git.opendaylight.org]:29418,[52.35.122.251]:29418,[2600:1f14:421:f500:7b21:2a58:ab0a:2d17]:29418 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAyRXyHEw/P1iZr/fFFzbodT5orVV/ftnNRW59Zh9rnSY5Rmbc9aygsZHdtiWBERVVv8atrJSdZool75AglPDDYtPICUGWLR91YBSDcZwReh5S9es1dlQ6fyWTnv9QggSZ98KTQEuE3t/b5SfH0T6tXWmrNydv4J2/mejKRRLU2+oumbeVN1yB+8Uau/3w9/K5F5LgsDDzLkW35djLhPV8r0OfmxV/cAnLl7AaZlaqcJMA+2rGKqM3m3Yu+pQw4pxOfCSpejlAwL6c8tA9naOvBkuJk+hYpg5tDEq2QFGRX5y1F9xQpwpdzZROc5hdGYntM79VMMXTj+95dwVv/8yTsw==
gearman_server: zuul01.openstack.org
# TODO this swap needs to happen as part of the server swap
#gearman_server: zuul02.opendev.org
gearman_server: zuul02.opendev.org
zuul_connections:
- name: 'smtp'
driver: 'smtp'

20
inventory/service/groups.yaml
View File

@ -20,7 +20,7 @@ groups:
- etherpad[0-9]*.opendev.org
- gitea01.opendev.org
- review[0-9]*.openstack.org
- zuul[0-9]*.open*.org
- zuul[0-9]*.opendev.org
- refstack01.openstack.org
- kdc03.openstack.org
# All these servers are "special-cased" in specifically
@ -97,7 +97,7 @@ groups:
- review[0-9]*.open*.org
- review-test.opendev.org
- static[0-9]*.opendev.org
- zuul[0-9]*.open*.org
- zuul[0-9]*.opendev.org
- refstack[0-9]*.openstack.org
logstash:
- logstash[0-9]*.open*.org
@ -239,16 +239,16 @@ groups:
zookeeper:
- zk[0-9]*.open*.org
zuul:
- ze[0-9]*.open*.org
- zm[0-9]*.open*.org
- zuul[0-9]*.open*.org
- ze[0-9]*.opendev.org
- zm[0-9]*.opendev.org
- zuul[0-9]*.opendev.org
zuul-executor:
- ze[0-9]*.open*.org
- ze[0-9]*.opendev.org
zuul-merger:
- zm[0-9]*.open*.org
- zm[0-9]*.opendev.org
zuul-preview:
- zp[0-9]*.open*.org
- zp[0-9]*.opendev.org
zuul-scheduler:
- zuul[0-9]*.open*.org
- zuul[0-9]*.opendev.org
zuul-web:
- zuul[0-9]*.open*.org
- zuul[0-9]*.opendev.org

9
inventory/service/host_vars/zuul01.openstack.org.yaml
View File

@ -1,9 +0,0 @@
gearman_server: 127.0.0.1
letsencrypt_certs:
zuul-opendev-main:
- zuul.opendev.org
- zuul.openstack.org
borg_backup_excludes_extra:
- /var/lib/zuul/backup/*
- /var/lib/zuul/times/*
- /var/log/zuul/*debug*

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

@ -23,9 +23,6 @@
- name: letsencrypt updated zuul-ci-git
include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml
- name: letsencrypt updated zuul-opendev-main
include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml
- name: letsencrypt updated zuul02-opendev-main
include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml

1
zuul.d/infra-prod.yaml
View File

@ -356,7 +356,6 @@
- inventory/service/group_vars/zuul
- inventory/service/group_vars/zookeeper.yaml
- inventory/service/host_vars/zk\d+
- inventory/service/host_vars/zuul01.openstack.org
- inventory/service/host_vars/zuul02.opendev.org
- playbooks/roles/install-docker/
- playbooks/roles/iptables/