diff --git a/playbooks/manual/upgrade/bodhi.yml b/playbooks/manual/upgrade/bodhi.yml index 625c7e796a..041d07975d 100644 --- a/playbooks/manual/upgrade/bodhi.yml +++ b/playbooks/manual/upgrade/bodhi.yml @@ -89,7 +89,7 @@ command: /usr/bin/alembic -c /usr/share/bodhi/alembic.ini upgrade head args: chdir: /usr/share/bodhi/ - when: inventory_hostname.startswith('bodhi-backend01') + when: inventory_hostname.startswith('bodhi-backend03') - name: And... start the backend again service: name="fedmsg-hub" state=started diff --git a/roles/bodhi2/backend/tasks/main.yml b/roles/bodhi2/backend/tasks/main.yml index c72bd3a1ea..95bdb66e44 100644 --- a/roles/bodhi2/backend/tasks/main.yml +++ b/roles/bodhi2/backend/tasks/main.yml @@ -162,7 +162,7 @@ cron: name="owner-sync-el5" minute="7,17,27,37,47,57" user="root" job="/usr/local/bin/owner-sync-pkgdb dist-5E-epel" cron_file=update-koji-owner-EL-5 - when: inventory_hostname.startswith('bodhi-backend01') and env == "production" + when: inventory_hostname.startswith('bodhi-backend03') and env == "production" tags: - bodhi @@ -170,7 +170,7 @@ cron: name="owner-sync-el6" minute="7,17,27,37,47,57" user="root" job="/usr/local/bin/owner-sync-pkgdb dist-6E-epel" cron_file=update-koji-owner-EL-6 - when: inventory_hostname.startswith('bodhi-backend01') and env == "production" + when: inventory_hostname.startswith('bodhi-backend03') and env == "production" tags: - bodhi @@ -178,7 +178,7 @@ cron: name="owner-sync-epel7" minute="7,17,27,37,47,57" user="root" job="/usr/local/bin/owner-sync-pkgdb epel7" cron_file=update-koji-owner-epel7 - when: inventory_hostname.startswith('bodhi-backend01') and env == "production" + when: inventory_hostname.startswith('bodhi-backend03') and env == "production" tags: - bodhi @@ -186,7 +186,7 @@ cron: name="owner-sync-fedora" minute="7,17,27,37,47,57" user="root" job="/usr/local/bin/owner-sync-pkgdb f23;/usr/local/bin/owner-sync-pkgdb f24;/usr/local/bin/owner-sync-pkgdb f25;/usr/local/bin/owner-sync-pkgdb f26" cron_file=update-koji-owner-fedora - when: inventory_hostname.startswith('bodhi-backend01') and env == "production" + when: inventory_hostname.startswith('bodhi-backend03') and env == "production" tags: - bodhi # @@ -195,7 +195,7 @@ - name: put fedora-updates-push in place copy: src=fedora-updates-push dest=/usr/local/bin/fedora-updates-push mode=0755 - when: inventory_hostname.startswith('bodhi-backend01') and env == "production" + when: inventory_hostname.startswith('bodhi-backend03') and env == "production" tags: - config - bodhi @@ -203,7 +203,7 @@ - name: put fedora-epel-push in place copy: src=fedora-epel-push dest=/usr/local/bin/fedora-epel-push mode=0755 - when: inventory_hostname.startswith('bodhi-backend01') and env == "production" + when: inventory_hostname.startswith('bodhi-backend03') and env == "production" tags: - config - bodhi @@ -211,7 +211,7 @@ - name: put update-fullfiletimelist in place copy: src="{{ files }}/scripts/update-fullfiletimelist" dest=/usr/local/bin/update-fullfiletimelist mode=0755 - when: inventory_hostname.startswith('bodhi-backend01') and env == "production" + when: inventory_hostname.startswith('bodhi-backend03') and env == "production" tags: - config - bodhi @@ -219,7 +219,7 @@ - name: add create-filelist script from quick-fedora-mirror copy: src="{{ files }}/scripts/create-filelist" dest=/usr/local/bin/create-filelist mode=0755 - when: inventory_hostname.startswith('bodhi-backend01') and env == "production" + when: inventory_hostname.startswith('bodhi-backend03') and env == "production" tags: - config - bodhi @@ -229,7 +229,7 @@ cron: name="updates-sync" minute="15,45" user="ftpsync" job="/usr/local/bin/lock-wrapper fedora-updates-push '/usr/local/bin/fedora-updates-push && /usr/local/bin/update-fullfiletimelist -l /tmp/update-fullfiletimelist-fedora.lock -t /pub fedora'" cron_file=updates-sync - when: inventory_hostname.startswith('bodhi-backend01') and env == "production" + when: inventory_hostname.startswith('bodhi-backend03') and env == "production" tags: - config - bodhi @@ -239,7 +239,7 @@ cron: name="epel-updates-sync" minute="15,45" user="ftpsync" job="/usr/local/bin/lock-wrapper fedora-epel-push '/usr/local/bin/fedora-epel-push && /usr/local/bin/update-fullfiletimelist -l /tmp/update-fullfiletimelist-epel.lock -t /pub epel'" cron_file=updates-sync - when: inventory_hostname.startswith('bodhi-backend01') and env == "production" + when: inventory_hostname.startswith('bodhi-backend03') and env == "production" tags: - config - bodhi @@ -249,7 +249,7 @@ cron: name="directory-sizes-update" minute="30" hour="19" user="ftpsync" job="/usr/bin/find /pub/alt/ /pub/archive/ /pub/fedora-secondary/ /pub/fedora/ /pub/epel/ -type d ! -path '/pub/alt/screenshots/f21/source' | grep -v snapshot | /usr/bin/xargs -n 1 /usr/bin/du --exclude=.snapshot -sh > /tmp/DIRECTORY_SIZES.txt 2> /dev/null; cp /tmp/DIRECTORY_SIZES.txt /pub/" cron_file=directory-sizes-update - when: inventory_hostname.startswith('bodhi-backend01') and env == "production" + when: inventory_hostname.startswith('bodhi-backend03') and env == "production" tags: - config - bodhi diff --git a/roles/bodhi2/base/templates/updates_handler.py b/roles/bodhi2/base/templates/updates_handler.py index 71cf540fd6..f993d7e39a 100644 --- a/roles/bodhi2/base/templates/updates_handler.py +++ b/roles/bodhi2/base/templates/updates_handler.py @@ -1,5 +1,5 @@ config = dict( - # Note, the masher runs on bodhi-backend01, but this + # Note, the masher runs on bodhi-backend03, but this # runs on bodhi-backend02 (separation of concerns). updates_handler={{bodhi_updates_handler_enabled}}, ) diff --git a/roles/nagios/server/files/nagios/hosts/bodhi-backend01.cfg b/roles/nagios/server/files/nagios/hosts/bodhi-backend01.cfg index 0ebba4a7bb..1efd68399d 100644 --- a/roles/nagios/server/files/nagios/hosts/bodhi-backend01.cfg +++ b/roles/nagios/server/files/nagios/hosts/bodhi-backend01.cfg @@ -1,7 +1,7 @@ -define host { - host_name bodhi-backend01 - alias bodhi-backend01.phx2.fedoraproject.org - use defaulttemplate - address bodhi-backend01.phx2.fedoraproject.org - parents bvirthost10 -} +#define host { +# host_name bodhi-backend01 +# alias bodhi-backend01.phx2.fedoraproject.org +# use defaulttemplate +# address bodhi-backend01.phx2.fedoraproject.org +# parents bvirthost10 +#}