From cf91bc0971cb079e8e5a454770a7fc7626da8b6b Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Tue, 12 Oct 2021 09:47:47 -0700
Subject: [PATCH] Remove the gerrit group in favor of the review group

Having two groups here was confusing. We seem to use the review group
for most ansible stuff so we prefer that one. We move contents of the
gerrit group_vars into the review group_vars and then clean up the use
of the old group vars file.

Change-Id: I7fa7467f703f5cec075e8e60472868c60ac031f7
---
 inventory/service/group_vars/gerrit.yaml              | 11 -----------
 inventory/service/group_vars/review.yaml              |  9 ++++++++-
 inventory/service/groups.yaml                         |  2 --
 .../inventory_plugins/test-fixtures/results.yaml      |  1 -
 zuul.d/infra-prod.yaml                                |  1 -
 zuul.d/project.yaml                                   |  1 -
 zuul.d/system-config-run.yaml                         |  1 -
 7 files changed, 8 insertions(+), 18 deletions(-)
 delete mode 100644 inventory/service/group_vars/gerrit.yaml

diff --git a/inventory/service/group_vars/gerrit.yaml b/inventory/service/group_vars/gerrit.yaml
deleted file mode 100644
index 06d8c11673..0000000000
--- a/inventory/service/group_vars/gerrit.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-# TODO can we combine this with the review.yaml group vars?
-# the review group seems to be what we use to match in the service-review.yaml
-# playbook which would make it canonical?
-exim_extra_aliases:
-  gerrit2: root
-iptables_rules:
-  - -p tcp --syn --dport 29418 -m connlimit --connlimit-above 100 -j REJECT
-iptables_extra_public_tcp_ports:
-  - 80
-  - 443
-  - 29418
diff --git a/inventory/service/group_vars/review.yaml b/inventory/service/group_vars/review.yaml
index cc88b92522..a24c0dc8d6 100644
--- a/inventory/service/group_vars/review.yaml
+++ b/inventory/service/group_vars/review.yaml
@@ -1,4 +1,11 @@
-# See TODO in the gerrit.yaml group vars.
+exim_extra_aliases:
+  gerrit2: root
+iptables_rules:
+  - -p tcp --syn --dport 29418 -m connlimit --connlimit-above 100 -j REJECT
+iptables_extra_public_tcp_ports:
+  - 80
+  - 443
+  - 29418
 gerrit_vhost_name: review.opendev.org
 gerrit_redirect_vhost: review.openstack.org
 gerrit_storyboard_url: https://storyboard.openstack.org
diff --git a/inventory/service/groups.yaml b/inventory/service/groups.yaml
index 97703992e8..850b107f16 100644
--- a/inventory/service/groups.yaml
+++ b/inventory/service/groups.yaml
@@ -57,8 +57,6 @@ groups:
   elasticsearch: elasticsearch[0-9]*.open*.org
   ethercalc: ethercalc*.open*.org
   etherpad: etherpad[0-9]*.open*.org
-  gerrit:
-    - review[0-9]*.opendev.org
   gitea:
     - gitea[0-9]*.opendev.org
   gitea-lb:
diff --git a/playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/results.yaml b/playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/results.yaml
index b109611d09..2e3ff5f126 100644
--- a/playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/results.yaml
+++ b/playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/results.yaml
@@ -34,7 +34,6 @@ results:
 
   review02.opendev.org:
     - borg-backup
-    - gerrit
     - letsencrypt
     - review
 
diff --git a/zuul.d/infra-prod.yaml b/zuul.d/infra-prod.yaml
index 85b0e8f2ed..ca1a52e854 100644
--- a/zuul.d/infra-prod.yaml
+++ b/zuul.d/infra-prod.yaml
@@ -396,7 +396,6 @@
     files:
       - inventory/base
       - playbooks/service-review.yaml
-      - inventory/service/group_vars/gerrit.yaml
       - inventory/service/group_vars/review.yaml
       - inventory/service/host_vars/review01.openstack.org.yaml
       - playbooks/roles/pip3/
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 02dc88c1ce..70bfd34755 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -364,7 +364,6 @@
             files:
               - inventory/.*
               - playbooks/manage-projects.yaml
-              - inventory/service/group_vars/gerrit.yaml
               - inventory/service/group_vars/review.yaml
               - inventory/service/group_vars/gitea.yaml
               - inventory/service/host_vars/gitea
diff --git a/zuul.d/system-config-run.yaml b/zuul.d/system-config-run.yaml
index 352cae46bb..4cc834f24e 100644
--- a/zuul.d/system-config-run.yaml
+++ b/zuul.d/system-config-run.yaml
@@ -875,7 +875,6 @@
       - playbooks/service-review.*.yaml
       - playbooks/test-review.yaml
       - playbooks/rename_repos.yaml
-      - inventory/service/group_vars/gerrit.yaml
       - inventory/service/group_vars/review.yaml
       - playbooks/roles/pip3/
       - playbooks/roles/install-docker/