From d3f892291c889e786104fa84e26cfee0889f9730 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Wed, 4 Apr 2018 16:39:08 +0000
Subject: [PATCH] Lets try and cut down on invalid fedmsg senders.

---
 inventory/group_vars/bodhi-backend-stg                |  3 +++
 inventory/group_vars/librariesio2fedmsg-stg           | 11 +++++++++++
 .../host_vars/bodhi-backend01.phx2.fedoraproject.org  |  3 +++
 .../host_vars/compose-x86-01.phx2.fedoraproject.org   |  1 +
 .../host_vars/rawhide-composer.phx2.fedoraproject.org |  1 +
 inventory/inventory                                   |  5 +++++
 6 files changed, 24 insertions(+)
 create mode 100644 inventory/group_vars/librariesio2fedmsg-stg

diff --git a/inventory/group_vars/bodhi-backend-stg b/inventory/group_vars/bodhi-backend-stg
index 20937ad041..692b237fd6 100644
--- a/inventory/group_vars/bodhi-backend-stg
+++ b/inventory/group_vars/bodhi-backend-stg
@@ -68,6 +68,9 @@ fedmsg_certs:
   - 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
diff --git a/inventory/group_vars/librariesio2fedmsg-stg b/inventory/group_vars/librariesio2fedmsg-stg
new file mode 100644
index 0000000000..e9bcb48712
--- /dev/null
+++ b/inventory/group_vars/librariesio2fedmsg-stg
@@ -0,0 +1,11 @@
+---
+# XXX - this is not really a group of real hosts.
+# Instead, it represents an application in openshift.
+# See playbooks/openshift-apps/waiverdb.yml
+
+fedmsg_env: stg
+
+fedmsg_certs:
+- service: librariesio2fedmsg
+  can_send:
+  - sse2fedmsg.librariesio
diff --git a/inventory/host_vars/bodhi-backend01.phx2.fedoraproject.org b/inventory/host_vars/bodhi-backend01.phx2.fedoraproject.org
index c85cc70f8f..0ace88e950 100644
--- a/inventory/host_vars/bodhi-backend01.phx2.fedoraproject.org
+++ b/inventory/host_vars/bodhi-backend01.phx2.fedoraproject.org
@@ -37,6 +37,7 @@ fedmsg_certs:
   - pungi.compose.phase.stop
   - pungi.compose.status.change
   - pungi.compose.createiso.targets
+  - pungi.compose.ostree
   - releng.atomic.twoweek.begin
   - releng.atomic.twoweek.complete
 # These are certs for the masher to publish its own messages as it progresses.
@@ -56,7 +57,9 @@ fedmsg_certs:
   - bodhi.update.eject
   - bodhi.update.complete.testing
   - bodhi.update.complete.stable
+  - bodhi.update.request.testing
   - bodhi.update.request.stable
+  - bodhi.update.request.batched
   - bodhi.update.karma.threshold.reach
   - bodhi.buildroot_override.untag
 - service: ftpsync
diff --git a/inventory/host_vars/compose-x86-01.phx2.fedoraproject.org b/inventory/host_vars/compose-x86-01.phx2.fedoraproject.org
index 13230dcee3..d01785fcf0 100644
--- a/inventory/host_vars/compose-x86-01.phx2.fedoraproject.org
+++ b/inventory/host_vars/compose-x86-01.phx2.fedoraproject.org
@@ -45,6 +45,7 @@ fedmsg_certs:
   - pungi.compose.createiso.targets
   - pungi.compose.createiso.imagefail
   - pungi.compose.createiso.imagedone
+  - pungi.compose.ostree
   # traditional old school compose stuff
   - compose.branched.complete
   - compose.branched.mash.complete
diff --git a/inventory/host_vars/rawhide-composer.phx2.fedoraproject.org b/inventory/host_vars/rawhide-composer.phx2.fedoraproject.org
index fda7f21ee7..504eaa7072 100644
--- a/inventory/host_vars/rawhide-composer.phx2.fedoraproject.org
+++ b/inventory/host_vars/rawhide-composer.phx2.fedoraproject.org
@@ -25,6 +25,7 @@ fedmsg_certs:
   - pungi.compose.createiso.targets
   - pungi.compose.createiso.imagefail
   - pungi.compose.createiso.imagedone
+  - pungi.compose.ostree
   - compose.rawhide.complete
   - compose.rawhide.mash.complete
   - compose.rawhide.mash.start
diff --git a/inventory/inventory b/inventory/inventory
index ab474afa02..baa94f0eea 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -1476,10 +1476,12 @@ bodhi-backend01.phx2.fedoraproject.org
 [openshift-pseudohosts:children]
 greenwave
 waiverdb
+#librariesio2fedmsg
 
 [openshift-pseudohosts-stg:children]
 greenwave-stg
 waiverdb-stg
+librariesio2fedmsg-stg
 
 [greenwave]
 greenwave-web-greenwave.app.os.fedoraproject.org
@@ -1492,3 +1494,6 @@ waiverdb-web-waiverdb.app.os.fedoraproject.org
 
 [waiverdb-stg]
 waiverdb-web-waiverdb.app.os.stg.fedoraproject.org
+
+[librariesio2fedmsg-stg]
+librariesio2fedmsg-librariesio2fedmsg.app.os.stg.fedoraproject.org