From fec80185814f92c8e0329830880931df0b5121ce Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Mon, 7 Jun 2021 11:06:18 +1000
Subject: [PATCH] Move gerritbot/accessbot to new eavesdrop server

This moves these services to eavesdrop01.opendev.org, a new
Focal-based server to host IRC services.

We have stopped running puppet on eavesdrop01.openstack.org so there
is nothing left for it to do (note the server is still running
meetbot/ptgbot).  Remove the commented out puppet run, and remove the
server from puppet groups.  Update the host in the Zuul jobs to the
new node.

Change-Id: I809f9af3e78f566362142790f6c79654ef5b8959
---
 inventory/service/groups.yaml    |  7 ++-----
 playbooks/service-eavesdrop.yaml | 23 +----------------------
 testinfra/test_eavesdrop.py      |  2 +-
 zuul.d/system-config-run.yaml    | 10 ++--------
 4 files changed, 6 insertions(+), 36 deletions(-)

diff --git a/inventory/service/groups.yaml b/inventory/service/groups.yaml
index 7902ee9aa5..adc8f2f3b9 100644
--- a/inventory/service/groups.yaml
+++ b/inventory/service/groups.yaml
@@ -49,8 +49,7 @@ groups:
   dns:
     - adns*.opendev.org
     - ns*.opendev.org
-  eavesdrop: eavesdrop[0-9]*.openstack.org
-  eavesdrop_opendev: eavesdrop[0-9]*.opendev.org
+  eavesdrop: eavesdrop[0-9]*.opendev.org
   elasticsearch: elasticsearch[0-9]*.open*.org
   ethercalc: ethercalc*.open*.org
   etherpad: etherpad[0-9]*.open*.org
@@ -134,7 +133,6 @@ groups:
   puppet:
     - ask*.open*.org
     - cacti[0-9]*.open*.org
-    - eavesdrop[0-9]*.openstack.org
     - elasticsearch[0-9]*.open*.org
     - ethercalc[0-9]*.open*.org
     - health[0-9]*.openstack.org
@@ -155,7 +153,6 @@ groups:
   puppet4:
     - ask*.open*.org
     - cacti[0-9]*.open*.org
-    - eavesdrop[0-9]*.openstack.org
     - elasticsearch[0-9]*.open*.org
     - ethercalc[0-9]*.open*.org
     - health[0-9]*.openstack.org
@@ -201,7 +198,7 @@ groups:
     - ask*.open*.org
     - cacti[0-9]*.open*.org
     - codesearch[0-9]*.opendev.org
-    - eavesdrop[0-9]*.open*.org
+    - eavesdrop[0-9]*.opendev.org
     - ethercalc[0-9]*.open*.org
     - etherpad[0-9]*.open*.org
     - grafana[0-9]*.opendev.org
diff --git a/playbooks/service-eavesdrop.yaml b/playbooks/service-eavesdrop.yaml
index 4b6afd43f0..84d2907429 100644
--- a/playbooks/service-eavesdrop.yaml
+++ b/playbooks/service-eavesdrop.yaml
@@ -1,30 +1,9 @@
-- hosts: 'localhost:!disabled'
-  name: Install puppet role/modules
-  strategy: linear
-  roles:
-    - puppet-setup-ansible
-
-- hosts: 'eavesdrop_opendev:!disabled'
+- hosts: 'eavesdrop:!disabled'
   name: "eavesdrop: install services"
   strategy: free
   roles:
     - iptables
     - install-docker
-
-- hosts: 'eavesdrop:!disabled'
-  name: "eavesdrop: run puppet on eavesdrop"
-  strategy: free
-  roles:
-    - iptables
     - sync-project-config
-    - install-docker
     - accessbot
     - gerritbot
-# NOTE(ianw) 2021-06-02
-#  We have disabled puppet because we are updating
-#  meetbot to python3, and we don't want to trigger
-#  pip trying to re-install it on the production server
-#  in case it tries to use python3 (even if we install from
-#  a tag, we're not sure puppet won't start using pip3 to install).
-#    - name: puppet-run
-#      manifest: /opt/system-config/production/manifests/eavesdrop.pp
diff --git a/testinfra/test_eavesdrop.py b/testinfra/test_eavesdrop.py
index 3f69a0b427..312ae7debc 100644
--- a/testinfra/test_eavesdrop.py
+++ b/testinfra/test_eavesdrop.py
@@ -13,7 +13,7 @@
 # under the License.
 
 
-testinfra_hosts = ['eavesdrop01.openstack.org']
+testinfra_hosts = ['eavesdrop01.opendev.org']
 
 
 def test_eavesdrop(host):
diff --git a/zuul.d/system-config-run.yaml b/zuul.d/system-config-run.yaml
index 1ebb6cef8f..cf811343f8 100644
--- a/zuul.d/system-config-run.yaml
+++ b/zuul.d/system-config-run.yaml
@@ -134,8 +134,8 @@
       nodes:
         - name: bridge.openstack.org
           label: ubuntu-bionic
-        - name: eavesdrop01.openstack.org
-          label: ubuntu-xenial
+        - name: eavesdrop01.opendev.org
+          label: ubuntu-focal
     vars:
       run_playbooks:
         - playbooks/service-eavesdrop.yaml
@@ -143,16 +143,10 @@
       - playbooks/service-eavesdrop.yaml
       - playbooks/run-accessbot.yaml
       - inventory/service/group_vars/eavesdrop.yaml
-      - inventory/service/group_vars/puppet.yaml
-      - playbooks/roles/zuul-user
       - playbooks/roles/install-docker
-      - playbooks/roles/puppet-install/
-      - playbooks/roles/disable-puppet-agent/
       - playbooks/roles/accessbot
       - playbooks/roles/logrotate
       - playbooks/zuul/templates/group_vars/eavesdrop.yaml.j2
-      - modules/openstack_project/manifests/eavesdrop.pp
-      - manifests/eavesdrop.pp
       - docker/accessbot/
       - testinfra/test_eavesdrop.py