From 95da7827011b88474acb43c8364013c7e309abd3 Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Tue, 28 May 2019 17:23:38 +0000 Subject: [PATCH] we had some entries for bodhi-backend03 which did not make sense to keep. remove them also --- handlers/restart_services.yml | 7 ------- inventory/group_vars/bodhi_backend | 3 +-- roles/fedmsg/base/templates/logging.py.j2 | 2 +- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/handlers/restart_services.yml b/handlers/restart_services.yml index c6f58b8697..d59dc9f783 100644 --- a/handlers/restart_services.yml +++ b/handlers/restart_services.yml @@ -26,13 +26,6 @@ - fedmsg-hub - 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 command: /usr/local/bin/conditional-restart.sh fedmsg-irc diff --git a/inventory/group_vars/bodhi_backend b/inventory/group_vars/bodhi_backend index 2454f936f0..1b5e4c7754 100644 --- a/inventory/group_vars/bodhi_backend +++ b/inventory/group_vars/bodhi_backend @@ -31,8 +31,7 @@ bodhi_message_routing_keys: - "org.fedoraproject.*.bodhi.composer.start" ## XXX -- note that the fedmsg_certs declaration does not happen here, but -# happens instead at the inventory/host_vars/ level since bodhi-backend03 and -# bodhi-backend02 have different roles and responsibilities. +# happens instead at the inventory/host_vars/ level s nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=3" diff --git a/roles/fedmsg/base/templates/logging.py.j2 b/roles/fedmsg/base/templates/logging.py.j2 index 6812c06c33..b4dd00f70f 100644 --- a/roles/fedmsg/base/templates/logging.py.j2 +++ b/roles/fedmsg/base/templates/logging.py.j2 @@ -183,7 +183,7 @@ config = dict( formatters=dict( bare={ "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 # threadName. We set the threadName in the bodhi masher to some # useful strings that will tell us which branch is doing what.