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

we had some entries for bodhi-backend03 which did not make sense to keep. remove them also

Browse source
This commit is contained in:
Stephen Smoogen 2019-05-28 17:23:38 +00:00
parent 31d95ec505
commit 95da782701
3 changed files with 2 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
handlers/restart_services.yml
View file

@ -26,13 +26,6 @@
- fedmsg-hub - fedmsg-hub
- fedmsg-hub-3 - fedmsg-hub-3
- name: restart fedmsg-hub-3
command: /usr/local/bin/conditional-restart.sh fedmsg-hub-3
# Note that, we're cool with arbitrary restarts on bodhi-backend02, just
# not bodhi-backend01 or bodhi-backend03. 01 and 03 is where the releng/mash
# stuff happens and we # don't want to interrupt that.
when: inventory_hostname not in ['bodhi-backend01.phx2.fedoraproject.org', 'bodhi-backend03.phx2.fedoraproject.org']
- name: restart fedmsg-irc - name: restart fedmsg-irc
command: /usr/local/bin/conditional-restart.sh fedmsg-irc command: /usr/local/bin/conditional-restart.sh fedmsg-irc

3
inventory/group_vars/bodhi_backend
View file

@ -31,8 +31,7 @@ bodhi_message_routing_keys:
- "org.fedoraproject.*.bodhi.composer.start" - "org.fedoraproject.*.bodhi.composer.start"
## XXX -- note that the fedmsg_certs declaration does not happen here, but ## XXX -- note that the fedmsg_certs declaration does not happen here, but
# happens instead at the inventory/host_vars/ level since bodhi-backend03 and # happens instead at the inventory/host_vars/ level s
# bodhi-backend02 have different roles and responsibilities.
nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=3" nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=3"

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

@ -183,7 +183,7 @@ config = dict(
formatters=dict( formatters=dict(
bare={ bare={
"datefmt": "%Y-%m-%d %H:%M:%S", "datefmt": "%Y-%m-%d %H:%M:%S",
{% if inventory_hostname.startswith(('bodhi-backend01', 'bodhi-backend03')) %} {% if inventory_hostname.startswith(('bodhi-backend01')) %}
# Here we use a different format just so we can include # Here we use a different format just so we can include
# threadName. We set the threadName in the bodhi masher to some # threadName. We set the threadName in the bodhi masher to some
# useful strings that will tell us which branch is doing what. # useful strings that will tell us which branch is doing what.