summaryrefslogtreecommitdiffstats
path: root/roles/fedmsg/base/templates
diff options
context:
space:
mode:
authorKevin Fenzi <kevin@scrye.com>2016-09-04 16:17:19 +0000
committerKevin Fenzi <kevin@scrye.com>2016-09-04 16:17:19 +0000
commit23e2dc4a2563fe67c36b83a43bca628dcee203d8 (patch)
tree44cd9cf604ac003eb1b95065860e070619fa673e /roles/fedmsg/base/templates
parentaf2c203ecc2c7f717ec9c3582977c0885faa5338 (diff)
downloadansible-23e2dc4a2563fe67c36b83a43bca628dcee203d8.tar.gz
ansible-23e2dc4a2563fe67c36b83a43bca628dcee203d8.tar.xz
ansible-23e2dc4a2563fe67c36b83a43bca628dcee203d8.zip
Revert "Revert part of the bodhi-backend03 changes to see if they caused problems."
This reverts commit 6e6d9365886993f4c42029df49ceed4f223913de.
Diffstat (limited to 'roles/fedmsg/base/templates')
-rw-r--r--roles/fedmsg/base/templates/endpoints-bodhi.py.j24
-rw-r--r--roles/fedmsg/base/templates/logging.py.j22
2 files changed, 5 insertions, 1 deletions
diff --git a/roles/fedmsg/base/templates/endpoints-bodhi.py.j2 b/roles/fedmsg/base/templates/endpoints-bodhi.py.j2
index a69ac4632..7238a8cb0 100644
--- a/roles/fedmsg/base/templates/endpoints-bodhi.py.j2
+++ b/roles/fedmsg/base/templates/endpoints-bodhi.py.j2
@@ -11,6 +11,10 @@ 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 ac4979426..55e0656e5 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 inventory_hostname.startswith('bodhi-backend01') %}
+ {% if ansible_hostname != 'bodhi-backend02' %}
# 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.