diff --git a/master.yml b/master.yml index df386f7c14..50c99c9538 100644 --- a/master.yml +++ b/master.yml @@ -12,28 +12,28 @@ # # group playbooks # -- include: /srv/web/infra/ansible/playbooks/groups/anitya.yml -- include: /srv/web/infra/ansible/playbooks/groups/arm-packager.yml -- include: /srv/web/infra/ansible/playbooks/groups/arm-qa.yml -- include: /srv/web/infra/ansible/playbooks/groups/ask.yml -- include: /srv/web/infra/ansible/playbooks/groups/atomic.yml -- include: /srv/web/infra/ansible/playbooks/groups/autosign.yml -- include: /srv/web/infra/ansible/playbooks/groups/backup-server.yml -- include: /srv/web/infra/ansible/playbooks/groups/badges-backend.yml -- include: /srv/web/infra/ansible/playbooks/groups/badges-web.yml -- include: /srv/web/infra/ansible/playbooks/groups/bastion.yml -- include: /srv/web/infra/ansible/playbooks/groups/beaker.yml -#- include: /srv/web/infra/ansible/playbooks/groups/beaker-stg.yml -- include: /srv/web/infra/ansible/playbooks/groups/beaker-virthosts.yml -- include: /srv/web/infra/ansible/playbooks/groups/blockerbugs.yml -- include: /srv/web/infra/ansible/playbooks/groups/bodhi.yml -- include: /srv/web/infra/ansible/playbooks/groups/bodhi2.yml -- include: /srv/web/infra/ansible/playbooks/groups/bodhi-backend.yml -- include: /srv/web/infra/ansible/playbooks/groups/bugzilla2fedmsg.yml -- include: /srv/web/infra/ansible/playbooks/groups/buildhw.yml -- include: /srv/web/infra/ansible/playbooks/groups/buildvm.yml -- include: /srv/web/infra/ansible/playbooks/groups/busgateway.yml -- include: /srv/web/infra/ansible/playbooks/groups/composers.yml +#- include: /srv/web/infra/ansible/playbooks/groups/anitya.yml +#- include: /srv/web/infra/ansible/playbooks/groups/arm-packager.yml +#- include: /srv/web/infra/ansible/playbooks/groups/arm-qa.yml +#- include: /srv/web/infra/ansible/playbooks/groups/ask.yml +#- include: /srv/web/infra/ansible/playbooks/groups/atomic.yml +#- include: /srv/web/infra/ansible/playbooks/groups/autosign.yml +#- include: /srv/web/infra/ansible/playbooks/groups/backup-server.yml +#- include: /srv/web/infra/ansible/playbooks/groups/badges-backend.yml +#- include: /srv/web/infra/ansible/playbooks/groups/badges-web.yml +#- include: /srv/web/infra/ansible/playbooks/groups/bastion.yml +#- include: /srv/web/infra/ansible/playbooks/groups/beaker.yml +##- include: /srv/web/infra/ansible/playbooks/groups/beaker-stg.yml +#- include: /srv/web/infra/ansible/playbooks/groups/beaker-virthosts.yml +#- include: /srv/web/infra/ansible/playbooks/groups/blockerbugs.yml +#- include: /srv/web/infra/ansible/playbooks/groups/bodhi.yml +#- include: /srv/web/infra/ansible/playbooks/groups/bodhi2.yml +#- include: /srv/web/infra/ansible/playbooks/groups/bodhi-backend.yml +#- include: /srv/web/infra/ansible/playbooks/groups/bugzilla2fedmsg.yml +#- include: /srv/web/infra/ansible/playbooks/groups/buildhw.yml +#- include: /srv/web/infra/ansible/playbooks/groups/buildvm.yml +#- include: /srv/web/infra/ansible/playbooks/groups/busgateway.yml +#- include: /srv/web/infra/ansible/playbooks/groups/composers.yml - include: /srv/web/infra/ansible/playbooks/groups/copr-backend.yml - include: /srv/web/infra/ansible/playbooks/groups/copr-frontend.yml - include: /srv/web/infra/ansible/playbooks/groups/copr-keygen.yml @@ -69,7 +69,7 @@ - include: /srv/web/infra/ansible/playbooks/groups/notifs-backend.yml - include: /srv/web/infra/ansible/playbooks/groups/notifs-web.yml - include: /srv/web/infra/ansible/playbooks/groups/nuancier.yml -- include: /srv/web/infra/ansible/playbooks/groups/openstack-compute-nodes.yml +#- include: /srv/web/infra/ansible/playbooks/groups/openstack-compute-nodes.yml - include: /srv/web/infra/ansible/playbooks/groups/osbs.yml - include: /srv/web/infra/ansible/playbooks/groups/packages.yml - include: /srv/web/infra/ansible/playbooks/groups/pagure.yml @@ -79,7 +79,7 @@ - include: /srv/web/infra/ansible/playbooks/groups/pkgs.yml - include: /srv/web/infra/ansible/playbooks/groups/postgresql-server.yml - include: /srv/web/infra/ansible/playbooks/groups/proxies.yml -- include: /srv/web/infra/ansible/playbooks/groups/qadevel.yml +#- include: /srv/web/infra/ansible/playbooks/groups/qadevel.yml #- include: /srv/web/infra/ansible/playbooks/groups/qa-stg.yml - include: /srv/web/infra/ansible/playbooks/groups/resultsdb-prod.yml - include: /srv/web/infra/ansible/playbooks/groups/resultsdb-dev.yml @@ -114,7 +114,7 @@ - include: /srv/web/infra/ansible/playbooks/hosts/darkserver-dev.fedorainfracloud.org.yml - include: /srv/web/infra/ansible/playbooks/hosts/devpi.cloud.fedoraproject.org.yml - include: /srv/web/infra/ansible/playbooks/hosts/dopr-dev.cloud.fedoraproject.org.yml -- include: /srv/web/infra/ansible/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml +#- include: /srv/web/infra/ansible/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml - include: /srv/web/infra/ansible/playbooks/hosts/junk01.phx2.fedoraproject.org.yml # Waiting for rhel7 python3 and reinstall #- include: /srv/web/infra/ansible/playbooks/hosts/lists-dev.cloud.fedoraproject.org.yml diff --git a/roles/bodhi2/backend/tasks/main.yml b/roles/bodhi2/backend/tasks/main.yml index c835ccf356..45f8d177b1 100644 --- a/roles/bodhi2/backend/tasks/main.yml +++ b/roles/bodhi2/backend/tasks/main.yml @@ -141,27 +141,30 @@ # # cron job that syncs packages to koji # -- name: put owner-sync-pkgdb in place - template: src=owner-sync-pkgdb.j2 dest=/usr/local/bin/owner-sync-pkgdb mode=0755 - tags: - - config +#- name: put owner-sync-pkgdb in place +# template: src=owner-sync-pkgdb.j2 dest=/usr/local/bin/owner-sync-pkgdb mode=0755 +# tags: +# - config - name: sync packages from pkgdb2 to koji (el5) 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 + state=absent when: inventory_hostname.startswith('bodhi-backend01') and env == "production" - name: sync packages from pkgdb2 to koji (el6) cron: name="owner-sync-el5" 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 + state=absent when: inventory_hostname.startswith('bodhi-backend01') and env == "production" - name: sync packages from pkgdb2 to koji (epel7) cron: name="owner-sync-el5" minute="7,17,27,37,47,57" user="root" job="/usr/local/bin/owner-sync-pkgdb epel7" cron_file=update-koji-owner-epel7 + state=absent when: inventory_hostname.startswith('bodhi-backend01') and env == "production" - name: sync packages from pkgdb2 to koji (f20) @@ -175,48 +178,48 @@ # cron job that syncs updates to master mirror # -- name: put fedora-updates-push in place - copy: src=fedora-updates-push dest=/usr/local/bin/fedora-updates-push mode=0755 - tags: - - config - when: inventory_hostname.startswith('bodhi-backend01') and env == "production" - -- name: put fedora-epel-push in place - copy: src=fedora-epel-push dest=/usr/local/bin/fedora-epel-push mode=0755 - tags: - - config - when: inventory_hostname.startswith('bodhi-backend02') and env == "production" - -- name: put update-fullfilelist in place - copy: src=update-fullfilelist dest=/usr/local/bin/update-fullfilelist mode=0755 - tags: - - config - when: inventory_hostname.startswith('bodhi-backend01') and env == "production" - -- name: Updates sync cron job. - 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-fullfilelist fedora" - cron_file=updates-sync - when: inventory_hostname.startswith('bodhi-backend01') and env == "production" - tags: - - config - -- name: epel Updates sync cron job. - 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-fullfilelist epel" - cron_file=updates-sync - when: inventory_hostname.startswith('bodhi-backend02') and env == "production" - tags: - - config - -- name: directory sizes update cron job. - cron: name="directory-sizes-update" minute="30" hour="19" user="ftpsync" - job="/usr/bin/find /srv/pub/alt/ /srv/pub/archive/ /srv/pub/fedora-secondary/ /srv/pub/fedora/ /srv/pub/epel/ -type d ! -path '/srv/pub/fedora/.snapshot*' ! -path '/srv/pub/epel/.snapshot*' ! -path '/srv/pub/alt/.snapshot*' ! -path '/srv/pub/archive/.snapshot*' ! -path '/srv/pub/fedora-secondary/.snapshot*' ! -path '/srv/pub/alt/stage*' ! -path '/srv/pub/alt/tmp' ! -path '/srv/pub/alt/screenshots/f21/source' | grep -v snapshot | /usr/bin/xargs -n 1 /usr/bin/du --exclude=.snapshot --exclude=stage -sh > /tmp/DIRECTORY_SIZES.txt 2> /dev/null; cp /tmp/DIRECTORY_SIZES.txt /srv/pub/" - cron_file=directory-sizes-update - when: inventory_hostname.startswith('bodhi-backend02') and env == "production" - tags: - - config - +#- name: put fedora-updates-push in place +# copy: src=fedora-updates-push dest=/usr/local/bin/fedora-updates-push mode=0755 +# tags: +# - config +# when: inventory_hostname.startswith('bodhi-backend01') and env == "production" +# +##- name: put fedora-epel-push in place +# copy: src=fedora-epel-push dest=/usr/local/bin/fedora-epel-push mode=0755 +# tags: +# - config +# when: inventory_hostname.startswith('bodhi-backend02') and env == "production" +# +#- name: put update-fullfilelist in place +# copy: src=update-fullfilelist dest=/usr/local/bin/update-fullfilelist mode=0755 +# tags: +# - config +# when: inventory_hostname.startswith('bodhi-backend01') and env == "production" +# +#- name: Updates sync cron job. +# 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-fullfilelist fedora" +# cron_file=updates-sync +# when: inventory_hostname.startswith('bodhi-backend01') and env == "production" +# tags: +# - config +# +#- name: epel Updates sync cron job. +# 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-fullfilelist epel" +# cron_file=updates-sync +# when: inventory_hostname.startswith('bodhi-backend02') and env == "production" +# tags: +# - config +# +#- name: directory sizes update cron job. +# cron: name="directory-sizes-update" minute="30" hour="19" user="ftpsync" +# job="/usr/bin/find /srv/pub/alt/ /srv/pub/archive/ /srv/pub/fedora-secondary/ /srv/pub/fedora/ /srv/pub/epel/ -type d ! -path '/srv/pub/fedora/.snapshot*' ! -path '/srv/pub/epel/.snapshot*' ! -path '/srv/pub/alt/.snapshot*' ! -path '/srv/pub/archive/.snapshot*' ! -path '/srv/pub/fedora-secondary/.snapshot*' ! -path '/srv/pub/alt/stage*' ! -path '/srv/pub/alt/tmp' ! -path '/srv/pub/alt/screenshots/f21/source' | grep -v snapshot | /usr/bin/xargs -n 1 /usr/bin/du --exclude=.snapshot --exclude=stage -sh > /tmp/DIRECTORY_SIZES.txt 2> /dev/null; cp /tmp/DIRECTORY_SIZES.txt /srv/pub/" +# cron_file=directory-sizes-update +# when: inventory_hostname.startswith('bodhi-backend02') and env == "production" +# tags: +# - config +# - name: have the masher own the bodhi config file: > path="/etc/bodhi/production.ini"