summaryrefslogtreecommitdiffstats
path: root/roles/fedmsg/base
diff options
context:
space:
mode:
authorKevin Fenzi <kevin@scrye.com>2016-08-13 02:30:04 +0000
committerKevin Fenzi <kevin@scrye.com>2016-08-13 02:30:04 +0000
commit6e6d9365886993f4c42029df49ceed4f223913de (patch)
treea8df0e8c27232853f787d14682c4e871b126e67a /roles/fedmsg/base
parentfdf6be9418d33f5c9790902dbcf9609efe86df76 (diff)
downloadansible-6e6d9365886993f4c42029df49ceed4f223913de.tar.gz
ansible-6e6d9365886993f4c42029df49ceed4f223913de.tar.xz
ansible-6e6d9365886993f4c42029df49ceed4f223913de.zip
Revert part of the bodhi-backend03 changes to see if they caused problems.
Diffstat (limited to 'roles/fedmsg/base')
-rw-r--r--roles/fedmsg/base/templates/endpoints-bodhi.py.j24
-rw-r--r--roles/fedmsg/base/templates/logging.py.j22
2 files changed, 1 insertions, 5 deletions
diff --git a/roles/fedmsg/base/templates/endpoints-bodhi.py.j2 b/roles/fedmsg/base/templates/endpoints-bodhi.py.j2
index 7238a8cb0..a69ac4632 100644
--- a/roles/fedmsg/base/templates/endpoints-bodhi.py.j2
+++ b/roles/fedmsg/base/templates/endpoints-bodhi.py.j2
@@ -11,10 +11,6 @@ config = dict(
"tcp://bodhi-backend01.%s:30%0.2i" % (suffix, i)
for i in range(20)
],
- "bodhi.bodhi-backend03": [
- "tcp://bodhi-backend03.%s:30%0.2i" % (suffix, i)
- for i in range(20)
- ],
{% if env != 'staging' %}
"bodhi.bodhi-backend02": [
"tcp://bodhi-backend02.%s:30%0.2i" % (suffix, i)
diff --git a/roles/fedmsg/base/templates/logging.py.j2 b/roles/fedmsg/base/templates/logging.py.j2
index 55e0656e5..ac4979426 100644
--- a/roles/fedmsg/base/templates/logging.py.j2
+++ b/roles/fedmsg/base/templates/logging.py.j2
@@ -176,7 +176,7 @@ config = dict(
formatters=dict(
bare={
"datefmt": "%Y-%m-%d %H:%M:%S",
- {% if ansible_hostname != 'bodhi-backend02' %}
+ {% if inventory_hostname.startswith('bodhi-backend01') %}
# Here we use a different format just so we can include
# threadName. We set the threadName in the bodhi masher to some
# useful strings that will tell us which branch is doing what.