From c743b7e4840d9214f0f2b604497d208c4126ed9e Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Mon, 10 May 2021 09:00:41 -0700
Subject: [PATCH] Clean up zuul01 from inventory
This cleans up zuul01 as it should no longer be used at this point. We
also make the inventory groups a bit more clear that all zuul servers
are under the opendev.org domain now.
Depends-On: https://review.opendev.org/c/opendev/zone-opendev.org/+/790483
Change-Id: I7885fe60028fbd87688f3ae920a24bce4d1a3acd
---
hiera/common.yaml | 1 -
inventory/base/hosts.yaml | 7 -------
inventory/service/group_vars/zuul.yaml | 4 +---
inventory/service/groups.yaml | 20 +++++++++----------
.../host_vars/zuul01.openstack.org.yaml | 9 ---------
.../handlers/main.yaml | 3 ---
zuul.d/infra-prod.yaml | 1 -
7 files changed, 11 insertions(+), 34 deletions(-)
delete mode 100644 inventory/service/host_vars/zuul01.openstack.org.yaml
diff --git a/hiera/common.yaml b/hiera/common.yaml
index 881a2a1331..4f13bb48af 100644
--- a/hiera/common.yaml
+++ b/hiera/common.yaml
@@ -322,7 +322,6 @@ cacti_hosts:
- zm06.opendev.org
- zm07.opendev.org
- zm08.opendev.org
-- zuul01.openstack.org
- zuul02.opendev.org
statusbot_auth_nicks:
- jeblair
diff --git a/inventory/base/hosts.yaml b/inventory/base/hosts.yaml
index cf65a3e706..30bca6fad1 100644
--- a/inventory/base/hosts.yaml
+++ b/inventory/base/hosts.yaml
@@ -885,13 +885,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:
diff --git a/inventory/service/group_vars/zuul.yaml b/inventory/service/group_vars/zuul.yaml
index 6e5ea74992..4bb8d9401c 100644
--- a/inventory/service/group_vars/zuul.yaml
+++ b/inventory/service/group_vars/zuul.yaml
@@ -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'
diff --git a/inventory/service/groups.yaml b/inventory/service/groups.yaml
index cd94220e22..89d3ada4d3 100644
--- a/inventory/service/groups.yaml
+++ b/inventory/service/groups.yaml
@@ -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
diff --git a/inventory/service/host_vars/zuul01.openstack.org.yaml b/inventory/service/host_vars/zuul01.openstack.org.yaml
deleted file mode 100644
index 2baac3dd72..0000000000
--- a/inventory/service/host_vars/zuul01.openstack.org.yaml
+++ /dev/null
@@ -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*
diff --git a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml
index b49a0a6be3..7a276cd8f7 100644
--- a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml
+++ b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml
@@ -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
diff --git a/zuul.d/infra-prod.yaml b/zuul.d/infra-prod.yaml
index 7709d110b0..da390487e4 100644
--- a/zuul.d/infra-prod.yaml
+++ b/zuul.d/infra-prod.yaml
@@ -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/