Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Revert "Revert part of the bodhi-backend03 changes to see if they caused problems."

Browse source 
This reverts commit 6e6d936588.
This commit is contained in:
Kevin Fenzi 2016-09-04 16:17:19 +00:00
parent af2c203ecc
commit 23e2dc4a25
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
roles/fedmsg/base/templates/endpoints-bodhi.py.j2
View file

@ -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)

2
roles/fedmsg/base/templates/logging.py.j2
View file

@ -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.