Merge "Remove the gerrit group in favor of the review group"

inventory/service/group_vars/gerrit.yaml

@@ -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

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

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:

playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/results.yaml

@@ -34,7 +34,6 @@ results:
 
   review02.opendev.org:
     - borg-backup
-    - gerrit
     - letsencrypt
     - review
 

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/

zuul.d/project.yaml

@@ -354,7 +354,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

zuul.d/system-config-run.yaml

@@ -896,7 +896,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/