From b91f19565a94c8944f22dc0f13ba978b0c3016fe Mon Sep 17 00:00:00 2001
From: Stephen Smoogen <ssmoogen@redhat.com>
Date: Jul 23 2020 19:08:13 +0000
Subject: comment out various wsgi_fedmsg_service variables for systems no longer running fedmsg listeners. try to cut down noise of problems so we can determine mbs and pdc issues


---

diff --git a/inventory/group_vars/badges_web b/inventory/group_vars/badges_web
index 1acadda..99d578e 100644
--- a/inventory/group_vars/badges_web
+++ b/inventory/group_vars/badges_web
@@ -8,7 +8,7 @@ freezes: false
 # 1) mod_wsgi is configured to use the vars for its own setup
 # 2) iptables opens enough ports for all threads for fedmsg
 # 3) roles/fedmsg/base/ declares enough fedmsg endpoints for all threads
-wsgi_fedmsg_service: tahrir
+#wsgi_fedmsg_service: tahrir
 wsgi_procs: 2
 wsgi_threads: 2
 
diff --git a/inventory/group_vars/badges_web_stg b/inventory/group_vars/badges_web_stg
index 4e3c70f..41ee3a8 100644
--- a/inventory/group_vars/badges_web_stg
+++ b/inventory/group_vars/badges_web_stg
@@ -8,7 +8,7 @@ num_cpus: 2
 # 1) mod_wsgi is configured to use the vars for its own setup
 # 2) iptables opens enough ports for all threads for fedmsg
 # 3) roles/fedmsg/base/ declares enough fedmsg endpoints for all threads
-wsgi_fedmsg_service: tahrir
+#wsgi_fedmsg_service: tahrir
 wsgi_procs: 2
 wsgi_threads: 2
 
diff --git a/inventory/group_vars/mbs_frontend b/inventory/group_vars/mbs_frontend
index 0122085..4c0cea3 100644
--- a/inventory/group_vars/mbs_frontend
+++ b/inventory/group_vars/mbs_frontend
@@ -7,7 +7,7 @@ num_cpus: 2
 # 1) mod_wsgi is configured to use the vars for its own setup
 # 2) iptables opens enough ports for all threads for fedmsg
 # 3) roles/fedmsg/base/ declares enough fedmsg endpoints for all threads
-wsgi_fedmsg_service: mbs
+#wsgi_fedmsg_service: mbs
 wsgi_procs: 2
 wsgi_threads: 2
 
diff --git a/inventory/group_vars/mbs_frontend_stg b/inventory/group_vars/mbs_frontend_stg
index ff8dfd5..30d58a8 100644
--- a/inventory/group_vars/mbs_frontend_stg
+++ b/inventory/group_vars/mbs_frontend_stg
@@ -7,7 +7,7 @@ num_cpus: 1
 # 1) mod_wsgi is configured to use the vars for its own setup
 # 2) iptables opens enough ports for all threads for fedmsg
 # 3) roles/fedmsg/base/ declares enough fedmsg endpoints for all threads
-wsgi_fedmsg_service: mbs
+#wsgi_fedmsg_service: mbs
 wsgi_procs: 2
 wsgi_threads: 2
 
diff --git a/inventory/group_vars/notifs_web b/inventory/group_vars/notifs_web
index 811c393..ca8f3d1 100644
--- a/inventory/group_vars/notifs_web
+++ b/inventory/group_vars/notifs_web
@@ -7,7 +7,7 @@ num_cpus: 2
 # for systems that do not match the above - specify the same parameter in
 # the host_vars/$hostname file
 
-wsgi_fedmsg_service: fmn
+#wsgi_fedmsg_service: fmn
 wsgi_procs: 2
 wsgi_threads: 2
 
diff --git a/inventory/group_vars/notifs_web_stg b/inventory/group_vars/notifs_web_stg
index 6559769..9fe4f1d 100644
--- a/inventory/group_vars/notifs_web_stg
+++ b/inventory/group_vars/notifs_web_stg
@@ -7,7 +7,7 @@ num_cpus: 2
 # for systems that do not match the above - specify the same parameter in
 # the host_vars/$hostname file
 
-wsgi_fedmsg_service: fmn
+#wsgi_fedmsg_service: fmn
 wsgi_procs: 2
 wsgi_threads: 2
 
diff --git a/inventory/group_vars/nuancier b/inventory/group_vars/nuancier
index a94743e..163e6c5 100644
--- a/inventory/group_vars/nuancier
+++ b/inventory/group_vars/nuancier
@@ -8,7 +8,7 @@ num_cpus: 2
 # 1) mod_wsgi is configured to use the vars for its own setup
 # 2) iptables opens enough ports for all threads for fedmsg
 # 3) roles/fedmsg/base/ declares enough fedmsg endpoints for all threads
-wsgi_fedmsg_service: nuancier
+#wsgi_fedmsg_service: nuancier
 wsgi_procs: 2
 wsgi_threads: 2
 
diff --git a/inventory/group_vars/nuancier_stg b/inventory/group_vars/nuancier_stg
index a94743e..163e6c5 100644
--- a/inventory/group_vars/nuancier_stg
+++ b/inventory/group_vars/nuancier_stg
@@ -8,7 +8,7 @@ num_cpus: 2
 # 1) mod_wsgi is configured to use the vars for its own setup
 # 2) iptables opens enough ports for all threads for fedmsg
 # 3) roles/fedmsg/base/ declares enough fedmsg endpoints for all threads
-wsgi_fedmsg_service: nuancier
+#wsgi_fedmsg_service: nuancier
 wsgi_procs: 2
 wsgi_threads: 2
 
diff --git a/roles/fedmsg/base/templates/endpoints-odcs-backend.py.j2 b/roles/fedmsg/base/templates/endpoints-odcs-backend.py.j2
deleted file mode 100644
index 8e6f6dd..0000000
--- a/roles/fedmsg/base/templates/endpoints-odcs-backend.py.j2
+++ /dev/null
@@ -1,24 +0,0 @@
-{% if datacenter == 'iad2' %}
-{% if env == 'staging' %}
-suffix  = 'stg.iad2.fedoraproject.org'
-{% else %}
-suffix = 'iad2.fedoraproject.org'
-vpn_suffix = 'vpn.fedoraproject.org'
-{% endif %}
-{% else %}
-{% if env == 'staging' %}
-suffix  = 'stg.fedoraproject.org'
-{% else %}
-suffix = 'fedoraproject.org'
-vpn_suffix = 'vpn.fedoraproject.org'
-{% endif %}
-{% endif %}
-
-config = dict(
-    endpoints={
-        "odcs.odcs-backend01": [
-            "tcp://odcs-backend01.%s:30%0.2i" % (suffix, i)
-            for i in range(8)
-        ],
-    },
-)