From 2dd354107eaa79a78348c76be33b9d4c619028a4 Mon Sep 17 00:00:00 2001
From: Randy Barlow <randy@electronsweatshop.com>
Date: Mon, 13 May 2019 18:28:28 +0000
Subject: [PATCH] bodhi: Move the message endpoints to the right file.

Signed-off-by: Randy Barlow <randy@electronsweatshop.com>
---
 inventory/group_vars/bodhi-backend-stg | 60 +++-----------------------
 inventory/group_vars/bodhi2-stg        |  3 --
 2 files changed, 5 insertions(+), 58 deletions(-)

diff --git a/inventory/group_vars/bodhi-backend-stg b/inventory/group_vars/bodhi-backend-stg
index 96c6293a5c..c8c9604975 100644
--- a/inventory/group_vars/bodhi-backend-stg
+++ b/inventory/group_vars/bodhi-backend-stg
@@ -10,16 +10,6 @@ dns: 10.5.126.21
 # Use the infra-testing repo
 testing: True
 
-# These are for fedmsg publication from the bodhi backend.
-# If you change these iptables rules, you also need to changes the endpoints
-# list in roles/fedmsg/base/templates/endpoints-bodhi.py
-tcp_ports: [
-    3000, 3001, 3002, 3003, 3004,
-    3005, 3006, 3007, 3008, 3009,
-    3010, 3011, 3012, 3013, 3014,
-    3015, 3016, 3017, 3018, 3019,
-]
-
 # Make connections from signing bridges stateless, they break sigul connections
 # https://bugzilla.redhat.com/show_bug.cgi?id=1283364
 custom_rules: ['-A INPUT --proto tcp --sport 44334 --source sign-bridge01.phx2.fedoraproject.org -j ACCEPT']
@@ -30,51 +20,11 @@ nrpe_procs_crit: 1000
 
 host_group: bodhi2
 
-# These people get told when something goes wrong.
-fedmsg_error_recipients:
-- bodhiadmin-members@fedoraproject.org
-
-# These set a config value in /etc/fedmsg.d/, see roles/bodhi2/base/
-# They are both true for the single bodhi-backend node in stg.
-bodhi_masher_enabled: True
-bodhi_updates_handler_enabled: True
-bodhi_signed_handler_enabled: True
-
-# These are consumed by a task in roles/fedmsg/base/main.yml
-fedmsg_certs:
-# This first cert is used by the push-tool.   releng members run it and it fires
-# off a simple fedmsg message that the masher (running as fedmsg-hub) is
-# listening for.  It then does all the worker.
-- service: shell
-  owner: root
-  group: masher
-  can_send:
-  - bodhi.masher.start
-  - logger.log
-# These are certs for the masher to publish its own messages as it progresses.
-- service: bodhi
-  owner: root
-  group: masher
-  can_send:
-  - bodhi.mashtask.complete
-  - bodhi.mashtask.mashing
-  - bodhi.mashtask.start
-  - bodhi.mashtask.sync.done
-  - bodhi.mashtask.sync.wait
-  - bodhi.errata.publish
-  - bodhi.update.eject
-  - bodhi.update.complete.testing
-  - bodhi.update.complete.stable
-  - bodhi.update.request.testing
-  - bodhi.update.request.stable
-  - bodhi.update.request.batched
-  - bodhi.buildroot_override.untag
-- service: ftpsync
-  owner: root
-  group: ftpsync
-  can_send:
-  - bodhi.updates.epel.sync
-  - bodhi.updates.fedora.sync
+# Define the topics that our fedora-messaging queue should be subscribed to.
+bodhi_message_routing_keys:
+  - "org.fedoraproject.*.bodhi.composer.start"
+  - "org.fedoraproject.*.bodhi.update.request.testing"
+  - "org.fedoraproject.*.buildsys.tag"
 
 fas_client_groups: sysadmin-releng,sysadmin-bodhi
 sudoers: "{{ private }}/files/sudo/00releng-sudoers"
diff --git a/inventory/group_vars/bodhi2-stg b/inventory/group_vars/bodhi2-stg
index 2cbea10f5c..8226ec11e2 100644
--- a/inventory/group_vars/bodhi2-stg
+++ b/inventory/group_vars/bodhi2-stg
@@ -34,9 +34,6 @@ host_group: bodhi2
 nfs_mount_opts: "ro,hard,bg,intr,noatime,nodev,nosuid"
 datacenter: staging
 
-bodhi_message_routing_keys: [ "org.fedoraproject.*.bodhi.composer.start", "org.fedoraproject.*.bodhi.update.request.testing", "org.fedoraproject.*.buildsys.tag"]
-
-
 # For the MOTD
 csi_security_category: Moderate
 csi_primary_contact: Bodhi Admins bodhiadmin-members@fedoraproject.org