From 23e2dc4a2563fe67c36b83a43bca628dcee203d8 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Sun, 4 Sep 2016 16:17:19 +0000
Subject: [PATCH] Revert "Revert part of the bodhi-backend03 changes to see if
 they caused problems."

This reverts commit 6e6d9365886993f4c42029df49ceed4f223913de.
---
 roles/fedmsg/base/templates/endpoints-bodhi.py.j2 | 4 ++++
 roles/fedmsg/base/templates/logging.py.j2         | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/roles/fedmsg/base/templates/endpoints-bodhi.py.j2 b/roles/fedmsg/base/templates/endpoints-bodhi.py.j2
index a69ac46322..7238a8cb0a 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 ac49794267..55e0656e57 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.