From ceff9bfca479cd37edcbca3042450f243d5d9556 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sun, 15 Oct 2017 19:46:08 +0000 Subject: [PATCH] first stab at replacing include with include_playbook or includ_tasks --- master.yml | 280 +++++++++--------- playbooks/check-host.yml | 4 +- playbooks/cloud_prep.yml | 4 +- playbooks/fedmsgupdate.yml | 44 +-- playbooks/fix_arm_soc.yml | 2 +- playbooks/groups/anitya.yml | 14 +- playbooks/groups/arm-qa.yml | 6 +- playbooks/groups/ask.yml | 10 +- playbooks/groups/autocloud-backend.yml | 12 +- playbooks/groups/autocloud-web.yml | 12 +- playbooks/groups/backup-server.yml | 10 +- playbooks/groups/badges-backend.yml | 12 +- playbooks/groups/badges-web.yml | 10 +- playbooks/groups/basset.yml | 10 +- playbooks/groups/bastion.yml | 10 +- playbooks/groups/batcave.yml | 10 +- playbooks/groups/beaker-virthosts.yml | 8 +- playbooks/groups/beaker.yml | 12 +- playbooks/groups/blockerbugs.yml | 10 +- playbooks/groups/bodhi-backend.yml | 10 +- playbooks/groups/bodhi2.yml | 10 +- playbooks/groups/bugyou.yml | 14 +- playbooks/groups/bugzilla2fedmsg.yml | 12 +- playbooks/groups/buildhw.yml | 10 +- playbooks/groups/buildvm.yml | 22 +- playbooks/groups/busgateway.yml | 12 +- playbooks/groups/certgetter.yml | 10 +- playbooks/groups/ci.yml | 12 +- playbooks/groups/copr-backend.yml | 6 +- playbooks/groups/copr-dist-git.yml | 8 +- playbooks/groups/copr-frontend.yml | 6 +- playbooks/groups/copr-keygen.yml | 6 +- playbooks/groups/darkserver-backend.yml | 14 +- playbooks/groups/darkserver-web.yml | 10 +- playbooks/groups/darkserver.yml | 10 +- playbooks/groups/datagrepper.yml | 16 +- playbooks/groups/dhcp.yml | 10 +- playbooks/groups/dns.yml | 10 +- playbooks/groups/docker-registry.yml | 10 +- playbooks/groups/download.yml | 12 +- playbooks/groups/elections.yml | 14 +- playbooks/groups/fas.yml | 10 +- playbooks/groups/fas3.yml | 10 +- playbooks/groups/fedimg.yml | 12 +- playbooks/groups/fedocal.yml | 14 +- playbooks/groups/freshmaker.yml | 16 +- playbooks/groups/github2fedmsg.yml | 12 +- playbooks/groups/gnome-backups.yml | 10 +- playbooks/groups/hosted.yml | 10 +- playbooks/groups/hotness.yml | 14 +- playbooks/groups/infinote.yml | 10 +- playbooks/groups/ipa.yml | 14 +- playbooks/groups/ipsilon.yml | 12 +- playbooks/groups/jenkins-master.yml | 12 +- playbooks/groups/jenkins-slave.yml | 14 +- playbooks/groups/kerneltest.yml | 12 +- playbooks/groups/keyserver.yml | 10 +- playbooks/groups/koji-hub.yml | 14 +- playbooks/groups/kojipkgs.yml | 10 +- playbooks/groups/koschei-backend.yml | 10 +- playbooks/groups/koschei-web.yml | 10 +- playbooks/groups/logserver.yml | 12 +- playbooks/groups/loopabull.yml | 14 +- playbooks/groups/mailman.yml | 12 +- playbooks/groups/maintainer-test.yml | 10 +- playbooks/groups/mariadb-server.yml | 10 +- playbooks/groups/mbs.yml | 20 +- playbooks/groups/mdapi.yml | 14 +- playbooks/groups/memcached.yml | 10 +- playbooks/groups/mirrorlist2.yml | 10 +- playbooks/groups/mirrormanager.yml | 18 +- playbooks/groups/modernpaste.yml | 12 +- playbooks/groups/noc.yml | 12 +- playbooks/groups/notifs-backend.yml | 12 +- playbooks/groups/notifs-web.yml | 10 +- playbooks/groups/nuancier.yml | 14 +- playbooks/groups/odcs.yml | 16 +- playbooks/groups/openqa-workers.yml | 8 +- playbooks/groups/openqa.yml | 16 +- playbooks/groups/openstack-compute-nodes.yml | 8 +- playbooks/groups/os-cluster.yml | 10 +- playbooks/groups/osbs-cluster.yml | 12 +- .../groups/osbs-orchestrator-cluster.yml | 10 +- playbooks/groups/packages.yml | 16 +- playbooks/groups/pagure.yml | 12 +- playbooks/groups/paste.yml | 10 +- playbooks/groups/pdc.yml | 14 +- playbooks/groups/people.yml | 10 +- playbooks/groups/piwik.yml | 10 +- playbooks/groups/pkgdb.yml | 14 +- playbooks/groups/pkgs.yml | 12 +- playbooks/groups/postgresql-server-bdr.yml | 10 +- playbooks/groups/postgresql-server.yml | 10 +- playbooks/groups/proxies.yml | 36 +-- playbooks/groups/qa.yml | 16 +- playbooks/groups/releng-compose.yml | 10 +- playbooks/groups/resultsdb-dev.yml | 12 +- playbooks/groups/resultsdb-prod.yml | 14 +- playbooks/groups/resultsdb-stg.yml | 14 +- playbooks/groups/retrace.yml | 10 +- playbooks/groups/secondary.yml | 10 +- playbooks/groups/sign-bridge.yml | 10 +- playbooks/groups/smtp-mm.yml | 10 +- playbooks/groups/statscache.yml | 14 +- playbooks/groups/summershum.yml | 14 +- playbooks/groups/sundries.yml | 12 +- playbooks/groups/tagger.yml | 14 +- playbooks/groups/taskotron-client-hosts.yml | 12 +- playbooks/groups/taskotron.yml | 14 +- playbooks/groups/torrent.yml | 10 +- playbooks/groups/transitional-datanommer.yml | 12 +- playbooks/groups/twisted-buildbots.yml | 4 +- playbooks/groups/unbound.yml | 10 +- playbooks/groups/value.yml | 10 +- playbooks/groups/virthost.yml | 8 +- playbooks/groups/wiki.yml | 10 +- playbooks/groups/zanata2fedmsg.yml | 12 +- .../ansiblemagazine.fedorainfracloud.org.yml | 6 +- .../hosts/artboard.fedorainfracloud.org.yml | 8 +- ...lockerbugs-dev.cloud.fedoraproject.org.yml | 10 +- .../cloud-noc01.cloud.fedoraproject.org.yml | 8 +- .../hosts/commops.fedorainfracloud.org.yml | 6 +- .../communityblog.fedorainfracloud.org.yml | 6 +- .../darkserver-dev.fedorainfracloud.org.yml | 8 +- ...data-analysis01.phx2.fedoraproject.org.yml | 10 +- .../hosts/developer.fedorainfracloud.org.yml | 6 +- .../hosts/eclipse.fedorainfracloud.org.yml | 8 +- .../hosts/faitout.fedorainfracloud.org.yml | 6 +- .../hosts/fas2-dev.fedorainfracloud.org.yml | 6 +- .../hosts/fas3-dev.fedorainfracloud.org.yml | 6 +- .../fed-cloud09.cloud.fedoraproject.org.yml | 8 +- .../hosts/fedimg-dev.fedorainfracloud.org.yml | 12 +- .../fedora-bootstrap.fedorainfracloud.org.yml | 6 +- ...littergallery-dev.fedorainfracloud.org.yml | 6 +- .../hosts/grafana.cloud.fedoraproject.org.yml | 14 +- .../hosts/graphite.fedorainfracloud.org.yml | 14 +- .../hosts/hubs-dev.fedorainfracloud.org.yml | 8 +- .../hosts/iddev.fedorainfracloud.org.yml | 10 +- .../hosts/insim.fedorainfracloud.org.yml | 6 +- .../hosts/java-deptools.fedorainfracloud.org | 6 +- .../hosts/lists-dev.fedorainfracloud.org.yml | 16 +- .../hosts/magazine2.fedorainfracloud.org.yml | 6 +- .../modernpaste.fedorainfracloud.org.yml | 8 +- .../hosts/modularity.fedorainfracloud.org.yml | 6 +- .../hosts/piwik.fedorainfracloud.org.yml | 10 +- .../hosts/regcfp2.fedorainfracloud.org.yml | 6 +- .../hosts/respins.fedorainfracloud.org.yml | 6 +- .../shogun-ca.cloud.fedoraproject.org.yml | 12 +- .../shumgrepper-dev.fedorainfracloud.org.yml | 6 +- .../hosts/taiga.fedorainfracloud.org.yml | 6 +- .../hosts/taigastg.fedorainfracloud.org.yml | 6 +- .../hosts/testdays.fedorainfracloud.org.yml | 8 +- .../upstreamfirst.fedorainfracloud.org.yml | 16 +- playbooks/include/proxies-certificates.yml | 2 +- playbooks/include/proxies-fedora-web.yml | 2 +- playbooks/include/proxies-fedorahosted.yml | 2 +- playbooks/include/proxies-haproxy.yml | 2 +- playbooks/include/proxies-miscellaneous.yml | 2 +- playbooks/include/proxies-redirects.yml | 2 +- playbooks/include/proxies-reverseproxy.yml | 2 +- playbooks/include/proxies-rewrites.yml | 2 +- playbooks/include/proxies-websites.yml | 2 +- playbooks/include/virt-create.yml | 4 +- playbooks/manual/autosign.yml | 10 +- playbooks/manual/kernel-qa.yml | 6 +- playbooks/manual/push-badges.yml | 6 +- playbooks/manual/qadevel.yml | 14 +- playbooks/manual/rebuild/mote.yml | 2 +- .../releng-emergency-expire-old-repo.yml | 2 +- playbooks/manual/restart-pagure.yml | 2 +- playbooks/manual/restart-pkgdb.yml | 2 +- playbooks/manual/sign-vault.yml | 10 +- playbooks/manual/staging-sync/bodhi.yml | 2 +- playbooks/manual/staging-sync/db-sync.yml | 12 +- playbooks/manual/staging-sync/fas.yml | 12 +- playbooks/manual/staging-sync/koji.yml | 6 +- playbooks/manual/staging-sync/koschei.yml | 6 +- playbooks/manual/staging-sync/mailman.yml | 6 +- playbooks/manual/staging-sync/pdc.yml | 2 +- playbooks/manual/stop_pkgdb.yml | 2 +- playbooks/manual/update-firmware.yml | 2 +- playbooks/manual/upgrade/anitya.yml | 6 +- playbooks/manual/upgrade/autocloud.yml | 14 +- playbooks/manual/upgrade/badges.yml | 10 +- playbooks/manual/upgrade/bodhi.yml | 8 +- playbooks/manual/upgrade/bugyou.yml | 4 +- playbooks/manual/upgrade/bugzilla2fedmsg.yml | 4 +- playbooks/manual/upgrade/datagrepper.yml | 4 +- playbooks/manual/upgrade/datanommer.yml | 10 +- playbooks/manual/upgrade/fedimg.yml | 8 +- playbooks/manual/upgrade/fedmsg.yml | 6 +- playbooks/manual/upgrade/fmn.yml | 8 +- playbooks/manual/upgrade/hotness.yml | 4 +- playbooks/manual/upgrade/koschei-testing.yml | 2 +- playbooks/manual/upgrade/koschei.yml | 8 +- playbooks/manual/upgrade/mbs.yml | 10 +- playbooks/manual/upgrade/mote.yml | 4 +- playbooks/manual/upgrade/odcs.yml | 10 +- playbooks/manual/upgrade/packages.yml | 4 +- playbooks/manual/upgrade/pagure.yml | 2 +- playbooks/manual/upgrade/pdc.yml | 6 +- playbooks/manual/upgrade/statscache.yml | 8 +- playbooks/manual/upgrade/tagger.yml | 4 +- playbooks/restart_unbound.yml | 2 +- playbooks/transient_cloud_instance.yml | 6 +- playbooks/update_ticketkey.yml | 4 +- playbooks/vhost_reboot.yml | 6 +- playbooks/vhost_update.yml | 2 +- roles/ansible-server/templates/ansible.cfg.j2 | 13 +- roles/base/tasks/main.yml | 6 +- 210 files changed, 1125 insertions(+), 1126 deletions(-) diff --git a/master.yml b/master.yml index 31533d64f4..e67dcae679 100644 --- a/master.yml +++ b/master.yml @@ -12,148 +12,148 @@ # # group playbooks -- include: /srv/web/infra/ansible/playbooks/groups/anitya.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/autocloud-backend.yml -- include: /srv/web/infra/ansible/playbooks/groups/autocloud-web.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/basset.yml -- include: /srv/web/infra/ansible/playbooks/groups/bastion.yml -- include: /srv/web/infra/ansible/playbooks/groups/batcave.yml -- include: /srv/web/infra/ansible/playbooks/groups/beaker.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/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/bugyou.yml -- include: /srv/web/infra/ansible/playbooks/groups/busgateway.yml -- include: /srv/web/infra/ansible/playbooks/groups/ci.yml -- include: /srv/web/infra/ansible/playbooks/groups/copr-backend.yml -- include: /srv/web/infra/ansible/playbooks/groups/copr-dist-git.yml -- include: /srv/web/infra/ansible/playbooks/groups/copr-frontend.yml -- include: /srv/web/infra/ansible/playbooks/groups/copr-keygen.yml -- include: /srv/web/infra/ansible/playbooks/groups/darkserver.yml -- include: /srv/web/infra/ansible/playbooks/groups/darkserver-backend.yml -- include: /srv/web/infra/ansible/playbooks/groups/darkserver-web.yml -- include: /srv/web/infra/ansible/playbooks/groups/datagrepper.yml -- include: /srv/web/infra/ansible/playbooks/groups/docker-registry.yml -- include: /srv/web/infra/ansible/playbooks/groups/dhcp.yml -- include: /srv/web/infra/ansible/playbooks/groups/dns.yml -- include: /srv/web/infra/ansible/playbooks/groups/download.yml -- include: /srv/web/infra/ansible/playbooks/groups/elections.yml -- include: /srv/web/infra/ansible/playbooks/groups/fas.yml -- include: /srv/web/infra/ansible/playbooks/groups/fas3.yml -- include: /srv/web/infra/ansible/playbooks/groups/fedimg.yml -- include: /srv/web/infra/ansible/playbooks/groups/fedocal.yml -- include: /srv/web/infra/ansible/playbooks/groups/github2fedmsg.yml -- include: /srv/web/infra/ansible/playbooks/groups/gnome-backups.yml -- include: /srv/web/infra/ansible/playbooks/groups/hosted.yml -- include: /srv/web/infra/ansible/playbooks/groups/hotness.yml -- include: /srv/web/infra/ansible/playbooks/groups/infinote.yml -- include: /srv/web/infra/ansible/playbooks/groups/ipa.yml -- include: /srv/web/infra/ansible/playbooks/groups/ipsilon.yml -- include: /srv/web/infra/ansible/playbooks/groups/jenkins-master.yml -- include: /srv/web/infra/ansible/playbooks/groups/jenkins-slave.yml -- include: /srv/web/infra/ansible/playbooks/groups/kerneltest.yml -- include: /srv/web/infra/ansible/playbooks/groups/keyserver.yml -- include: /srv/web/infra/ansible/playbooks/groups/koji-hub.yml -- include: /srv/web/infra/ansible/playbooks/groups/kojipkgs.yml -- include: /srv/web/infra/ansible/playbooks/groups/koschei-backend.yml -- include: /srv/web/infra/ansible/playbooks/groups/koschei-web.yml -- include: /srv/web/infra/ansible/playbooks/groups/logserver.yml -- include: /srv/web/infra/ansible/playbooks/groups/loopabull.yml -- include: /srv/web/infra/ansible/playbooks/groups/mbs.yml -- include: /srv/web/infra/ansible/playbooks/groups/mailman.yml -- include: /srv/web/infra/ansible/playbooks/groups/maintainer-test.yml -- include: /srv/web/infra/ansible/playbooks/groups/mariadb-server.yml -- include: /srv/web/infra/ansible/playbooks/groups/mdapi.yml -- include: /srv/web/infra/ansible/playbooks/groups/mirrorlist2.yml -- include: /srv/web/infra/ansible/playbooks/groups/mirrormanager.yml -- include: /srv/web/infra/ansible/playbooks/groups/memcached.yml -- include: /srv/web/infra/ansible/playbooks/groups/modernpaste.yml -- include: /srv/web/infra/ansible/playbooks/groups/noc.yml -- 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/openqa.yml -- include: /srv/web/infra/ansible/playbooks/groups/openqa-workers.yml -- include: /srv/web/infra/ansible/playbooks/groups/openstack-compute-nodes.yml -- include: /srv/web/infra/ansible/playbooks/groups/osbs-cluster.yml -- include: /srv/web/infra/ansible/playbooks/groups/os-cluster.yml -- include: /srv/web/infra/ansible/playbooks/groups/packages.yml -- include: /srv/web/infra/ansible/playbooks/groups/pagure.yml -- include: /srv/web/infra/ansible/playbooks/groups/paste.yml -- include: /srv/web/infra/ansible/playbooks/groups/pdc.yml -- include: /srv/web/infra/ansible/playbooks/groups/people.yml -- include: /srv/web/infra/ansible/playbooks/groups/pkgdb.yml -- 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/postgresql-server-bdr.yml -- include: /srv/web/infra/ansible/playbooks/groups/proxies.yml -#- include: /srv/web/infra/ansible/playbooks/groups/qa.yml -- include: /srv/web/infra/ansible/playbooks/groups/resultsdb-prod.yml -- include: /srv/web/infra/ansible/playbooks/groups/resultsdb-dev.yml -- include: /srv/web/infra/ansible/playbooks/groups/resultsdb-stg.yml -- include: /srv/web/infra/ansible/playbooks/groups/retrace.yml -- include: /srv/web/infra/ansible/playbooks/groups/releng-compose.yml -- include: /srv/web/infra/ansible/playbooks/groups/secondary.yml -- include: /srv/web/infra/ansible/playbooks/groups/smtp-mm.yml -- include: /srv/web/infra/ansible/playbooks/groups/sign-bridge.yml -- include: /srv/web/infra/ansible/playbooks/groups/statscache.yml -- include: /srv/web/infra/ansible/playbooks/groups/summershum.yml -- include: /srv/web/infra/ansible/playbooks/groups/sundries.yml -- include: /srv/web/infra/ansible/playbooks/groups/tagger.yml -- include: /srv/web/infra/ansible/playbooks/groups/taskotron.yml -- include: /srv/web/infra/ansible/playbooks/groups/taskotron-client-hosts.yml -- include: /srv/web/infra/ansible/playbooks/groups/torrent.yml -- include: /srv/web/infra/ansible/playbooks/groups/twisted-buildbots.yml -- include: /srv/web/infra/ansible/playbooks/groups/unbound.yml -- include: /srv/web/infra/ansible/playbooks/groups/value.yml -- include: /srv/web/infra/ansible/playbooks/groups/virthost.yml -- include: /srv/web/infra/ansible/playbooks/groups/wiki.yml -- include: /srv/web/infra/ansible/playbooks/groups/zanata2fedmsg.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/anitya.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/arm-qa.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/ask.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/autocloud-backend.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/autocloud-web.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/backup-server.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/badges-backend.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/badges-web.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/basset.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/bastion.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/batcave.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/beaker.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/beaker-virthosts.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/blockerbugs.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/bodhi2.yml +#- import_playbook: /srv/web/infra/ansible/playbooks/groups/bodhi-backend.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/bugzilla2fedmsg.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/buildhw.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/buildvm.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/bugyou.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/busgateway.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/ci.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/copr-backend.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/copr-dist-git.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/copr-frontend.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/copr-keygen.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/darkserver.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/darkserver-backend.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/darkserver-web.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/datagrepper.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/docker-registry.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/dhcp.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/dns.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/download.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/elections.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/fas.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/fas3.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/fedimg.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/fedocal.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/github2fedmsg.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/gnome-backups.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/hosted.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/hotness.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/infinote.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/ipa.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/ipsilon.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/jenkins-master.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/jenkins-slave.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/kerneltest.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/keyserver.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/koji-hub.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/kojipkgs.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/koschei-backend.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/koschei-web.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/logserver.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/loopabull.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/mbs.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/mailman.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/maintainer-test.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/mariadb-server.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/mdapi.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/mirrorlist2.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/mirrormanager.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/memcached.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/modernpaste.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/noc.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/notifs-backend.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/notifs-web.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/nuancier.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/openqa.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/openqa-workers.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/openstack-compute-nodes.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/osbs-cluster.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/os-cluster.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/packages.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/pagure.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/paste.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/pdc.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/people.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/pkgdb.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/pkgs.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/postgresql-server.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/postgresql-server-bdr.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/proxies.yml +#- import_playbook: /srv/web/infra/ansible/playbooks/groups/qa.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/resultsdb-prod.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/resultsdb-dev.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/resultsdb-stg.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/retrace.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/releng-compose.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/secondary.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/smtp-mm.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/sign-bridge.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/statscache.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/summershum.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/sundries.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/tagger.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/taskotron.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/taskotron-client-hosts.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/torrent.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/twisted-buildbots.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/unbound.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/value.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/virthost.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/wiki.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/zanata2fedmsg.yml # # host playbooks # -- include: /srv/web/infra/ansible/playbooks/hosts/artboard.fedorainfracloud.org.yml -- include: /srv/web/infra/ansible/playbooks/hosts/cloud-noc01.cloud.fedoraproject.org.yml -- include: /srv/web/infra/ansible/playbooks/hosts/communityblog.fedorainfracloud.org.yml -- include: /srv/web/infra/ansible/playbooks/hosts/commops.fedorainfracloud.org.yml -- include: /srv/web/infra/ansible/playbooks/hosts/darkserver-dev.fedorainfracloud.org.yml -- include: /srv/web/infra/ansible/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml -- include: /srv/web/infra/ansible/playbooks/hosts/developer.fedorainfracloud.org.yml -- include: /srv/web/infra/ansible/playbooks/hosts/eclipse.fedorainfracloud.org.yml -- include: /srv/web/infra/ansible/playbooks/hosts/fas2-dev.fedorainfracloud.org.yml -- include: /srv/web/infra/ansible/playbooks/hosts/fas3-dev.fedorainfracloud.org.yml -#- include: /srv/web/infra/ansible/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml -- include: /srv/web/infra/ansible/playbooks/hosts/faitout.fedorainfracloud.org.yml -- include: /srv/web/infra/ansible/playbooks/hosts/fedora-bootstrap.fedorainfracloud.org.yml -- include: /srv/web/infra/ansible/playbooks/hosts/fedimg-dev.fedorainfracloud.org.yml -- include: /srv/web/infra/ansible/playbooks/hosts/glittergallery-dev.fedorainfracloud.org.yml -- include: /srv/web/infra/ansible/playbooks/hosts/grafana.cloud.fedoraproject.org.yml -- include: /srv/web/infra/ansible/playbooks/hosts/graphite.fedorainfracloud.org.yml -- include: /srv/web/infra/ansible/playbooks/hosts/hubs-dev.fedorainfracloud.org.yml -- include: /srv/web/infra/ansible/playbooks/hosts/iddev.fedorainfracloud.org.yml -- include: /srv/web/infra/ansible/playbooks/hosts/insim.fedorainfracloud.org.yml -- include: /srv/web/infra/ansible/playbooks/hosts/lists-dev.fedorainfracloud.org.yml -- include: /srv/web/infra/ansible/playbooks/hosts/magazine2.fedorainfracloud.org.yml -- include: /srv/web/infra/ansible/playbooks/hosts/ansiblemagazine.fedorainfracloud.org.yml -- include: /srv/web/infra/ansible/playbooks/hosts/modernpaste.fedorainfracloud.org.yml -- include: /srv/web/infra/ansible/playbooks/hosts/modularity.fedorainfracloud.org.yml -- include: /srv/web/infra/ansible/playbooks/hosts/piwik.fedorainfracloud.org.yml -#- include: /srv/web/infra/ansible/playbooks/hosts/regcfp2.fedorainfracloud.org.yml -- include: /srv/web/infra/ansible/playbooks/hosts/respins.fedorainfracloud.org.yml -- include: /srv/web/infra/ansible/playbooks/hosts/shogun-ca.cloud.fedoraproject.org.yml -- include: /srv/web/infra/ansible/playbooks/hosts/shumgrepper-dev.fedorainfracloud.org.yml -- include: /srv/web/infra/ansible/playbooks/hosts/taiga.fedorainfracloud.org.yml -- include: /srv/web/infra/ansible/playbooks/hosts/taigastg.fedorainfracloud.org.yml -- include: /srv/web/infra/ansible/playbooks/hosts/testdays.fedorainfracloud.org.yml -- include: /srv/web/infra/ansible/playbooks/hosts/upstreamfirst.fedorainfracloud.org.yml +- import_playbook: /srv/web/infra/ansible/playbooks/hosts/artboard.fedorainfracloud.org.yml +- import_playbook: /srv/web/infra/ansible/playbooks/hosts/cloud-noc01.cloud.fedoraproject.org.yml +- import_playbook: /srv/web/infra/ansible/playbooks/hosts/communityblog.fedorainfracloud.org.yml +- import_playbook: /srv/web/infra/ansible/playbooks/hosts/commops.fedorainfracloud.org.yml +- import_playbook: /srv/web/infra/ansible/playbooks/hosts/darkserver-dev.fedorainfracloud.org.yml +- import_playbook: /srv/web/infra/ansible/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml +- import_playbook: /srv/web/infra/ansible/playbooks/hosts/developer.fedorainfracloud.org.yml +- import_playbook: /srv/web/infra/ansible/playbooks/hosts/eclipse.fedorainfracloud.org.yml +- import_playbook: /srv/web/infra/ansible/playbooks/hosts/fas2-dev.fedorainfracloud.org.yml +- import_playbook: /srv/web/infra/ansible/playbooks/hosts/fas3-dev.fedorainfracloud.org.yml +#- import_playbook: /srv/web/infra/ansible/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml +- import_playbook: /srv/web/infra/ansible/playbooks/hosts/faitout.fedorainfracloud.org.yml +- import_playbook: /srv/web/infra/ansible/playbooks/hosts/fedora-bootstrap.fedorainfracloud.org.yml +- import_playbook: /srv/web/infra/ansible/playbooks/hosts/fedimg-dev.fedorainfracloud.org.yml +- import_playbook: /srv/web/infra/ansible/playbooks/hosts/glittergallery-dev.fedorainfracloud.org.yml +- import_playbook: /srv/web/infra/ansible/playbooks/hosts/grafana.cloud.fedoraproject.org.yml +- import_playbook: /srv/web/infra/ansible/playbooks/hosts/graphite.fedorainfracloud.org.yml +- import_playbook: /srv/web/infra/ansible/playbooks/hosts/hubs-dev.fedorainfracloud.org.yml +- import_playbook: /srv/web/infra/ansible/playbooks/hosts/iddev.fedorainfracloud.org.yml +- import_playbook: /srv/web/infra/ansible/playbooks/hosts/insim.fedorainfracloud.org.yml +- import_playbook: /srv/web/infra/ansible/playbooks/hosts/lists-dev.fedorainfracloud.org.yml +- import_playbook: /srv/web/infra/ansible/playbooks/hosts/magazine2.fedorainfracloud.org.yml +- import_playbook: /srv/web/infra/ansible/playbooks/hosts/ansiblemagazine.fedorainfracloud.org.yml +- import_playbook: /srv/web/infra/ansible/playbooks/hosts/modernpaste.fedorainfracloud.org.yml +- import_playbook: /srv/web/infra/ansible/playbooks/hosts/modularity.fedorainfracloud.org.yml +- import_playbook: /srv/web/infra/ansible/playbooks/hosts/piwik.fedorainfracloud.org.yml +#- import_playbook: /srv/web/infra/ansible/playbooks/hosts/regcfp2.fedorainfracloud.org.yml +- import_playbook: /srv/web/infra/ansible/playbooks/hosts/respins.fedorainfracloud.org.yml +- import_playbook: /srv/web/infra/ansible/playbooks/hosts/shogun-ca.cloud.fedoraproject.org.yml +- import_playbook: /srv/web/infra/ansible/playbooks/hosts/shumgrepper-dev.fedorainfracloud.org.yml +- import_playbook: /srv/web/infra/ansible/playbooks/hosts/taiga.fedorainfracloud.org.yml +- import_playbook: /srv/web/infra/ansible/playbooks/hosts/taigastg.fedorainfracloud.org.yml +- import_playbook: /srv/web/infra/ansible/playbooks/hosts/testdays.fedorainfracloud.org.yml +- import_playbook: /srv/web/infra/ansible/playbooks/hosts/upstreamfirst.fedorainfracloud.org.yml diff --git a/playbooks/check-host.yml b/playbooks/check-host.yml index ccb4cf6340..62332968df 100644 --- a/playbooks/check-host.yml +++ b/playbooks/check-host.yml @@ -265,5 +265,5 @@ # handlers: -# - include: "{{ handlers_path }}/restart_services.yml" -# - include: "restart_services.yml" +# - include_tasks: "{{ handlers_path }}/restart_services.yml" +# - include_tasks: "restart_services.yml" diff --git a/playbooks/cloud_prep.yml b/playbooks/cloud_prep.yml index 74420b8132..411ac184c2 100644 --- a/playbooks/cloud_prep.yml +++ b/playbooks/cloud_prep.yml @@ -7,8 +7,8 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - - include: "{{ tasks_path }}/cloud_setup_basic.yml" + - include_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/fedmsgupdate.yml b/playbooks/fedmsgupdate.yml index 8d0d7d9257..f08c356721 100644 --- a/playbooks/fedmsgupdate.yml +++ b/playbooks/fedmsgupdate.yml @@ -4,25 +4,25 @@ # # Call it with -t fedmsgdupdate to only run that one play. # -- include: /srv/web/infra/ansible/playbooks/hosts/copr-be.cloud.fedoraproject.org.yml -- include: /srv/web/infra/ansible/playbooks/groups/ask.yml -- include: /srv/web/infra/ansible/playbooks/groups/bodhi.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/busgateway.yml -- include: /srv/web/infra/ansible/playbooks/groups/elections.yml -- include: /srv/web/infra/ansible/playbooks/groups/fedocal.yml -- include: /srv/web/infra/ansible/playbooks/groups/gallery.yml -- include: /srv/web/infra/ansible/playbooks/groups/keyserver.yml -- include: /srv/web/infra/ansible/playbooks/groups/koji-hub.yml -- include: /srv/web/infra/ansible/playbooks/groups/mailman.yml -- 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/packages.yml -- include: /srv/web/infra/ansible/playbooks/groups/pkgdb.yml -- include: /srv/web/infra/ansible/playbooks/groups/releng.yml -- include: /srv/web/infra/ansible/playbooks/groups/summershum.yml -- include: /srv/web/infra/ansible/playbooks/groups/tagger.yml -- include: /srv/web/infra/ansible/playbooks/groups/wiki.yml -- include: /srv/web/infra/ansible/playbooks/groups/value.yml +- include_playbook: /srv/web/infra/ansible/playbooks/hosts/copr-be.cloud.fedoraproject.org.yml +- include_playbook: /srv/web/infra/ansible/playbooks/groups/ask.yml +- include_playbook: /srv/web/infra/ansible/playbooks/groups/bodhi.yml +- include_playbook: /srv/web/infra/ansible/playbooks/groups/badges-backend.yml +- include_playbook: /srv/web/infra/ansible/playbooks/groups/badges-web.yml +- include_playbook: /srv/web/infra/ansible/playbooks/groups/busgateway.yml +- include_playbook: /srv/web/infra/ansible/playbooks/groups/elections.yml +- include_playbook: /srv/web/infra/ansible/playbooks/groups/fedocal.yml +- include_playbook: /srv/web/infra/ansible/playbooks/groups/gallery.yml +- include_playbook: /srv/web/infra/ansible/playbooks/groups/keyserver.yml +- include_playbook: /srv/web/infra/ansible/playbooks/groups/koji-hub.yml +- include_playbook: /srv/web/infra/ansible/playbooks/groups/mailman.yml +- include_playbook: /srv/web/infra/ansible/playbooks/groups/notifs-backend.yml +- include_playbook: /srv/web/infra/ansible/playbooks/groups/notifs-web.yml +- include_playbook: /srv/web/infra/ansible/playbooks/groups/nuancier.yml +- include_playbook: /srv/web/infra/ansible/playbooks/groups/packages.yml +- include_playbook: /srv/web/infra/ansible/playbooks/groups/pkgdb.yml +- include_playbook: /srv/web/infra/ansible/playbooks/groups/releng.yml +- include_playbook: /srv/web/infra/ansible/playbooks/groups/summershum.yml +- include_playbook: /srv/web/infra/ansible/playbooks/groups/tagger.yml +- include_playbook: /srv/web/infra/ansible/playbooks/groups/wiki.yml +- include_playbook: /srv/web/infra/ansible/playbooks/groups/value.yml diff --git a/playbooks/fix_arm_soc.yml b/playbooks/fix_arm_soc.yml index 05cad4e555..23140ba4a5 100644 --- a/playbooks/fix_arm_soc.yml +++ b/playbooks/fix_arm_soc.yml @@ -30,4 +30,4 @@ delegate_to: "{{target}}" command: ntpdate -u bastion01.phx2.fedoraproject.org -- include: groups/buildhw.yml hosts="{{target}}" +- include_playbook: groups/buildhw.yml hosts="{{target}}" diff --git a/playbooks/groups/anitya.yml b/playbooks/groups/anitya.yml index 8d60fdadb4..680b391440 100644 --- a/playbooks/groups/anitya.yml +++ b/playbooks/groups/anitya.yml @@ -1,5 +1,5 @@ # create a new sks keyserver -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=anitya" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=anitya" - name: make the boxen be real for real hosts: anitya @@ -22,12 +22,12 @@ - openvpn/client tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: set up the frontend bits hosts: anitya-frontend @@ -56,7 +56,7 @@ - anitya handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: set up the backend bits hosts: anitya-backend @@ -76,4 +76,4 @@ - anitya handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/arm-qa.yml b/playbooks/groups/arm-qa.yml index f97485a94d..629d68c38c 100644 --- a/playbooks/groups/arm-qa.yml +++ b/playbooks/groups/arm-qa.yml @@ -12,7 +12,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" roles: - base @@ -23,7 +23,7 @@ tasks: # this is how you include other task lists - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/ask.yml b/playbooks/groups/ask.yml index f1bed3c506..ffd7cb4136 100644 --- a/playbooks/groups/ask.yml +++ b/playbooks/groups/ask.yml @@ -1,4 +1,4 @@ -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=ask-stg:ask" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=ask-stg:ask" - name: make the box be real hosts: ask-stg:ask @@ -26,12 +26,12 @@ when: env != "staging" } tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: set up gluster on stg hosts: ask-stg diff --git a/playbooks/groups/autocloud-backend.yml b/playbooks/groups/autocloud-backend.yml index b849bd876a..3c8b3c5043 100644 --- a/playbooks/groups/autocloud-backend.yml +++ b/playbooks/groups/autocloud-backend.yml @@ -1,4 +1,4 @@ -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=autocloud-backend-stg" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=autocloud-backend-stg" - name: dole out the generic configuration hosts: autocloud-backend:autocloud-backend-stg @@ -11,7 +11,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" roles: - base @@ -24,11 +24,11 @@ - sudo tasks: - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: dole out the service-specific config hosts: autocloud-backend:autocloud-backend-stg @@ -39,7 +39,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" roles: - redis diff --git a/playbooks/groups/autocloud-web.yml b/playbooks/groups/autocloud-web.yml index e5277b0724..b7d8907c93 100644 --- a/playbooks/groups/autocloud-web.yml +++ b/playbooks/groups/autocloud-web.yml @@ -1,4 +1,4 @@ -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=autocloud-web:autocloud-web-stg" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=autocloud-web:autocloud-web-stg" - name: make the box be real hosts: autocloud-web:autocloud-web-stg @@ -11,7 +11,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" roles: - base @@ -27,11 +27,11 @@ when: env != "staging" tasks: - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: dole out the app-specific configuration hosts: autocloud-web:autocloud-web-stg @@ -43,7 +43,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" roles: - autocloud/frontend diff --git a/playbooks/groups/backup-server.yml b/playbooks/groups/backup-server.yml index 4916c14e32..b8e1abc67c 100644 --- a/playbooks/groups/backup-server.yml +++ b/playbooks/groups/backup-server.yml @@ -28,10 +28,10 @@ - openvpn/client tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" - - include: "{{ tasks_path }}/rdiff_backup_server.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/rdiff_backup_server.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/badges-backend.yml b/playbooks/groups/badges-backend.yml index 14169d4143..298cc23455 100644 --- a/playbooks/groups/badges-backend.yml +++ b/playbooks/groups/badges-backend.yml @@ -3,7 +3,7 @@ # NOTE: make sure there is room/space for this server on the vmhost # NOTE: most of these vars_path come from group_vars/mirrorlist or from hostvars -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=badges-backend:badges-backend-stg" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=badges-backend:badges-backend-stg" - name: dole out the generic configuration hosts: badges-backend:badges-backend-stg @@ -28,12 +28,12 @@ when: env != "staging" } tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: dole out the service-specific config hosts: badges-backend:badges-backend-stg @@ -52,4 +52,4 @@ - "{{ vars_path }}/{{ ansible_distribution }}.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/badges-web.yml b/playbooks/groups/badges-web.yml index 75f4c94acb..df3804f8f6 100644 --- a/playbooks/groups/badges-web.yml +++ b/playbooks/groups/badges-web.yml @@ -3,7 +3,7 @@ # NOTE: make sure there is room/space for this server on the vmhost # NOTE: most of these vars_path come from group_vars/badges-web* or from hostvars -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=badges-web:badges-web-stg" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=badges-web:badges-web-stg" - name: make the box be real hosts: badges-web:badges-web-stg @@ -39,9 +39,9 @@ interval: 10 tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/basset.yml b/playbooks/groups/basset.yml index a53e99ddeb..7389846ae9 100644 --- a/playbooks/groups/basset.yml +++ b/playbooks/groups/basset.yml @@ -1,6 +1,6 @@ # create a new basset server -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=basset:basset-stg" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=basset:basset-stg" - name: make the box be real hosts: basset:basset-stg @@ -30,9 +30,9 @@ - basset/worker tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/bastion.yml b/playbooks/groups/bastion.yml index 625397dc23..303cc650e5 100644 --- a/playbooks/groups/bastion.yml +++ b/playbooks/groups/bastion.yml @@ -1,4 +1,4 @@ -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=bastion" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=bastion" - name: make the boxen be real for real hosts: bastion @@ -23,12 +23,12 @@ - opendkim tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: configure bastion-qa hosts: bastion-comm01.qa.fedoraproject.org diff --git a/playbooks/groups/batcave.yml b/playbooks/groups/batcave.yml index 64a97283b2..2af96b10c8 100644 --- a/playbooks/groups/batcave.yml +++ b/playbooks/groups/batcave.yml @@ -1,4 +1,4 @@ -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=batcave" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=batcave" - name: make the box be real hosts: batcave @@ -34,9 +34,9 @@ - { role: nfs/client, mnt_dir: '/mnt/fedora/app', nfs_src_dir: 'fedora_app/app' } tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/beaker-virthosts.yml b/playbooks/groups/beaker-virthosts.yml index 109fee1819..da93f086fc 100644 --- a/playbooks/groups/beaker-virthosts.yml +++ b/playbooks/groups/beaker-virthosts.yml @@ -27,9 +27,9 @@ - { role: beaker/virthost, tags: ['beakervirthost'] } tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/beaker.yml b/playbooks/groups/beaker.yml index 6a8bc24ec1..a0a9d5f685 100644 --- a/playbooks/groups/beaker.yml +++ b/playbooks/groups/beaker.yml @@ -2,7 +2,7 @@ # NOTE: make sure there is room/space for this server on the vmhost # NOTE: most of these vars_path come from group_vars/mirrorlist or from hostvars -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=beaker:beaker-stg" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=beaker:beaker-stg" - name: make the box be real hosts: beaker:beaker-stg @@ -28,12 +28,12 @@ tasks: # this is how you include other task lists - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: configure beaker and required services hosts: beaker:beaker-stg @@ -52,5 +52,5 @@ - { role: beaker/labcontroller, tags: ['beakerlabcontroller'] } handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/blockerbugs.yml b/playbooks/groups/blockerbugs.yml index e195795630..707dfa61dc 100644 --- a/playbooks/groups/blockerbugs.yml +++ b/playbooks/groups/blockerbugs.yml @@ -1,4 +1,4 @@ -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=blockerbugs:blockerbugs-stg" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=blockerbugs:blockerbugs-stg" - name: make the box be real hosts: blockerbugs:blockerbugs-stg @@ -26,9 +26,9 @@ - blockerbugs tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/bodhi-backend.yml b/playbooks/groups/bodhi-backend.yml index 848f13e4c4..6338fe75d2 100644 --- a/playbooks/groups/bodhi-backend.yml +++ b/playbooks/groups/bodhi-backend.yml @@ -5,7 +5,7 @@ # They also run some misc releng scripts. # -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=bodhi-backend:bodhi-backend-stg" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=bodhi-backend:bodhi-backend-stg" # Once the instance exists, configure it. @@ -77,9 +77,9 @@ file: src=/mnt/fedora_koji_prod/koji dest=/mnt/koji/vol/prod state=link tags: bodhi when: env == 'staging' - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/bodhi2.yml b/playbooks/groups/bodhi2.yml index 3108da5961..fa6fb352d7 100644 --- a/playbooks/groups/bodhi2.yml +++ b/playbooks/groups/bodhi2.yml @@ -1,4 +1,4 @@ -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=bodhi2:bodhi2-stg" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=bodhi2:bodhi2-stg" - name: make the box be real hosts: bodhi2:bodhi2-stg @@ -41,9 +41,9 @@ when: env == "staging" tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/bugyou.yml b/playbooks/groups/bugyou.yml index 8a7800338d..c2b4eea768 100644 --- a/playbooks/groups/bugyou.yml +++ b/playbooks/groups/bugyou.yml @@ -3,7 +3,7 @@ # NOTE: make sure there is room/space for this server on the vmhost # NOTE: most of these vars_path come from group_vars/mirrorlist or from hostvars -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=bugyou:bugyou-stg" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=bugyou:bugyou-stg" - name: dole out the generic configuration hosts: bugyou:bugyou-stg @@ -25,12 +25,12 @@ - sudo tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: set up fedmsg basics hosts: bugyou:bugyou-stg @@ -46,7 +46,7 @@ - fedmsg/base handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: dole out the service-specific config hosts: bugyou:bugyou-stg @@ -66,4 +66,4 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/bugzilla2fedmsg.yml b/playbooks/groups/bugzilla2fedmsg.yml index d9d264d821..44e18a4b51 100644 --- a/playbooks/groups/bugzilla2fedmsg.yml +++ b/playbooks/groups/bugzilla2fedmsg.yml @@ -3,7 +3,7 @@ # NOTE: make sure there is room/space for this server on the vmhost # NOTE: most of these vars_path come from group_vars/mirrorlist or from hostvars -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=bugzilla2fedmsg:bugzilla2fedmsg-stg" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=bugzilla2fedmsg:bugzilla2fedmsg-stg" - name: dole out the generic configuration hosts: bugzilla2fedmsg:bugzilla2fedmsg-stg @@ -26,12 +26,12 @@ - fedmsg/base tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: dole out the service-specific config hosts: bugzilla2fedmsg:bugzilla2fedmsg-stg @@ -49,4 +49,4 @@ - "{{ vars_path }}/{{ ansible_distribution }}.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/buildhw.yml b/playbooks/groups/buildhw.yml index 68a640f6aa..ac3d0ab0f9 100644 --- a/playbooks/groups/buildhw.yml +++ b/playbooks/groups/buildhw.yml @@ -13,8 +13,8 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/osbs_certs.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/osbs_certs.yml" roles: - base @@ -29,13 +29,13 @@ service: compile tasks: - - include: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" when: not inventory_hostname.startswith('bkernel') - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" when: not inventory_hostname.startswith('bkernel') - name: make sure kojid is running service: name=kojid state=started enabled=yes handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/buildvm.yml b/playbooks/groups/buildvm.yml index ac74b41901..f22474eceb 100644 --- a/playbooks/groups/buildvm.yml +++ b/playbooks/groups/buildvm.yml @@ -3,7 +3,7 @@ # NOTE: make sure there is room/space for this builder on the buildvmhost # NOTE: most of these vars_path come from group_vars/buildvm or from hostvars -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=buildvm:buildvm-stg:buildvm-aarch64:buildvm-armv7:buildvm-ppc64:buildvm-ppc64le:buildppcle:buildppc:buildvm-s390:buildvm-ppc64-stg:buildvm-ppc64le-stg:buildvm-aarch64-stg:buildvm-armv7-stg" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=buildvm:buildvm-stg:buildvm-aarch64:buildvm-armv7:buildvm-ppc64:buildvm-ppc64le:buildppcle:buildppc:buildvm-s390:buildvm-ppc64-stg:buildvm-ppc64le-stg:buildvm-aarch64-stg:buildvm-armv7-stg" - name: make koji builder(s) hosts: buildvm:buildvm-stg:buildvm-aarch64:buildvm-armv7:buildvm-ppc64:buildvm-ppc64le:buildppcle:buildppc:buildvm-s390:buildvm-ppc64-stg:buildvm-ppc64le-stg:buildvm-aarch64-stg:buildvm-armv7-stg:buildvm-s390x @@ -16,7 +16,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" roles: - base @@ -42,16 +42,16 @@ when: env == "staging" tasks: - - include: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" when: not inventory_hostname.startswith('bkernel') - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" when: not inventory_hostname.startswith('bkernel') - name: make sure kojid is running service: name=kojid state=started enabled=yes handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: configure osbs on koji builders hosts: buildvm:buildvm-stg @@ -66,8 +66,8 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks_path }}/osbs_certs.yml" - - include: "{{ tasks_path }}/osbs_repos.yml" + - include_tasks: "{{ tasks_path }}/osbs_certs.yml" + - include_tasks: "{{ tasks_path }}/osbs_repos.yml" roles: - { @@ -137,7 +137,7 @@ } } handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: configure varnish cache on buildvm-s390x-07.s390.fedoraproject.org @@ -156,7 +156,7 @@ - varnish handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: configure sshfs on buildvm-s390x-01.s390.fedoraproject.org hosts: buildvm-s390x-01.s390.fedoraproject.org @@ -194,7 +194,7 @@ - sshfs handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: configure sshfs target on koji01 hosts: koji01.phx2.fedoraproject.org @@ -218,4 +218,4 @@ - sshfs handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/busgateway.yml b/playbooks/groups/busgateway.yml index 45e02b4c71..00af286a77 100644 --- a/playbooks/groups/busgateway.yml +++ b/playbooks/groups/busgateway.yml @@ -1,4 +1,4 @@ -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=busgateway:busgateway-stg" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=busgateway:busgateway-stg" - name: dole out the generic configuration hosts: busgateway:busgateway-stg @@ -23,12 +23,12 @@ when: env != "staging" } tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: dole out the service-specific config hosts: busgateway:busgateway-stg @@ -55,4 +55,4 @@ - "{{ vars_path }}/{{ ansible_distribution }}.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/certgetter.yml b/playbooks/groups/certgetter.yml index 2a7362e57e..9dbcf3a801 100644 --- a/playbooks/groups/certgetter.yml +++ b/playbooks/groups/certgetter.yml @@ -1,4 +1,4 @@ -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=certgetter" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=certgetter" - name: make the box be real hosts: certgetter @@ -22,9 +22,9 @@ when: env != "staging" } tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/ci.yml b/playbooks/groups/ci.yml index fcef5d185b..13db764f61 100644 --- a/playbooks/groups/ci.yml +++ b/playbooks/groups/ci.yml @@ -3,7 +3,7 @@ # NOTE: make sure there is room/space for this server on the vmhost # NOTE: most of these vars_path come from group_vars/mirrorlist or from hostvars -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=ci-cc-rdu01.fedoraproject.org" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=ci-cc-rdu01.fedoraproject.org" - name: make the box be real hosts: ci @@ -32,12 +32,12 @@ tasks: # this is how you include other task lists - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: configure resultsdb production hosts: ci @@ -57,4 +57,4 @@ - { role: ccsdb, tags: ['ccsdb'] } handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/copr-backend.yml b/playbooks/groups/copr-backend.yml index af4199d9af..ede88a423c 100644 --- a/playbooks/groups/copr-backend.yml +++ b/playbooks/groups/copr-backend.yml @@ -10,7 +10,7 @@ - /srv/web/infra/ansible/vars/fedora-cloud.yml - /srv/private/ansible/files/openstack/passwords.yml tasks: - - include: "{{ tasks_path }}/persistent_cloud.yml" + - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" - name: cloud basic setup hosts: copr-back:copr-back-stg @@ -21,8 +21,8 @@ - /srv/private/ansible/vars.yml tasks: - - include: "{{ tasks_path }}/cloud_setup_basic.yml" - - include: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{copr_hostbase}}.cloud.fedoraproject.org" diff --git a/playbooks/groups/copr-dist-git.yml b/playbooks/groups/copr-dist-git.yml index 6ab6c9b8d1..16bc8fe137 100644 --- a/playbooks/groups/copr-dist-git.yml +++ b/playbooks/groups/copr-dist-git.yml @@ -10,7 +10,7 @@ - /srv/private/ansible/files/openstack/passwords.yml tasks: - - include: "{{ tasks_path }}/persistent_cloud.yml" + - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" - name: cloud basic setup hosts: copr-dist-git-stg:copr-dist-git @@ -21,8 +21,8 @@ - "/srv/private/ansible/vars.yml" tasks: - - include: "{{ tasks_path }}/cloud_setup_basic.yml" - - include: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{copr_hostbase}}.cloud.fedoraproject.org" @@ -41,4 +41,4 @@ - copr/dist_git handlers: - - include: "../../handlers/restart_services.yml" + - include_tasks: "../../handlers/restart_services.yml" diff --git a/playbooks/groups/copr-frontend.yml b/playbooks/groups/copr-frontend.yml index 86a4d319e7..f56a07d648 100644 --- a/playbooks/groups/copr-frontend.yml +++ b/playbooks/groups/copr-frontend.yml @@ -10,7 +10,7 @@ - /srv/private/ansible/files/openstack/passwords.yml tasks: - - include: "{{ tasks_path }}/persistent_cloud.yml" + - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" - name: cloud basic setup hosts: copr-front-stg:copr-front @@ -21,8 +21,8 @@ - "/srv/private/ansible/vars.yml" tasks: - - include: "{{ tasks_path }}/cloud_setup_basic.yml" - - include: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{copr_hostbase}}.cloud.fedoraproject.org" diff --git a/playbooks/groups/copr-keygen.yml b/playbooks/groups/copr-keygen.yml index 03af004330..a2f318898c 100644 --- a/playbooks/groups/copr-keygen.yml +++ b/playbooks/groups/copr-keygen.yml @@ -10,7 +10,7 @@ - /srv/private/ansible/files/openstack/passwords.yml tasks: - - include: "{{ tasks_path }}/persistent_cloud.yml" + - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" - name: gather facts setup: check_mode: no @@ -29,8 +29,8 @@ - "/srv/private/ansible/vars.yml" tasks: - - include: "{{ tasks_path }}/cloud_setup_basic.yml" - - include: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{copr_hostbase}}.cloud.fedoraproject.org" diff --git a/playbooks/groups/darkserver-backend.yml b/playbooks/groups/darkserver-backend.yml index c90249c255..c74ec9f66c 100644 --- a/playbooks/groups/darkserver-backend.yml +++ b/playbooks/groups/darkserver-backend.yml @@ -1,4 +1,4 @@ -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=darkserver-backend:darkserver-backend-stg" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=darkserver-backend:darkserver-backend-stg" - name: make the box be real hosts: darkserver-backend:darkserver-backend-stg @@ -31,12 +31,12 @@ - role: apache tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: set up fedmsg basics hosts: darkserver-backend:darkserver-backend-stg @@ -52,7 +52,7 @@ - fedmsg/base handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: dole out the service-specific config hosts: darkserver-backend:darkserver-backend-stg @@ -73,4 +73,4 @@ process: fedmsg-hub handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/darkserver-web.yml b/playbooks/groups/darkserver-web.yml index 071ddaf2a8..92e285786a 100644 --- a/playbooks/groups/darkserver-web.yml +++ b/playbooks/groups/darkserver-web.yml @@ -1,4 +1,4 @@ -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=darkserver-web:darkserver-web-stg" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=darkserver-web:darkserver-web-stg" - name: make the box be real hosts: darkserver-web:darkserver-web-stg @@ -31,10 +31,10 @@ - darkserver/web tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/darkserver.yml b/playbooks/groups/darkserver.yml index 14f12db2b1..3e28903ab3 100644 --- a/playbooks/groups/darkserver.yml +++ b/playbooks/groups/darkserver.yml @@ -1,4 +1,4 @@ -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=darkserver:darkserver-stg" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=darkserver:darkserver-stg" - name: make the box be real hosts: darkserver:darkserver-stg @@ -32,9 +32,9 @@ - darkserver tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/datagrepper.yml b/playbooks/groups/datagrepper.yml index c1751ff442..0cc9fbcb68 100644 --- a/playbooks/groups/datagrepper.yml +++ b/playbooks/groups/datagrepper.yml @@ -1,6 +1,6 @@ # create a new datagrepper server -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=datagrepper:datagrepper-stg" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=datagrepper:datagrepper-stg" - name: make the box be real hosts: datagrepper:datagrepper-stg @@ -27,12 +27,12 @@ - mod_wsgi tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: dole out the service-specific config hosts: datagrepper:datagrepper-stg @@ -52,7 +52,7 @@ interval: 15 handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" # The gluster work here can be omitted for now. It is used by a feature of # datagrepper that is partially in place, but not yet functional. @@ -77,7 +77,7 @@ # datadir: /srv/glusterfs/datagrepper # # handlers: -# - include: "{{ handlers_path }}/restart_services.yml" +# - include_tasks: "{{ handlers_path }}/restart_services.yml" # #- name: set up gluster client on prod # hosts: datagrepper:datagrepper-stg @@ -102,4 +102,4 @@ # mountdir: /var/cache/datagrepper # # handlers: -# - include: "{{ handlers_path }}/restart_services.yml" +# - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/dhcp.yml b/playbooks/groups/dhcp.yml index 8cb32b06b7..a7612b1524 100644 --- a/playbooks/groups/dhcp.yml +++ b/playbooks/groups/dhcp.yml @@ -1,4 +1,4 @@ -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=dhcp" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=dhcp" - name: make the box be real hosts: dhcp @@ -22,9 +22,9 @@ - tftp_server tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/dns.yml b/playbooks/groups/dns.yml index f56012e3ec..2461d94cb8 100644 --- a/playbooks/groups/dns.yml +++ b/playbooks/groups/dns.yml @@ -1,6 +1,6 @@ # create a new dns server -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=dns" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=dns" - name: make the box be real hosts: dns @@ -26,9 +26,9 @@ - dns tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/docker-registry.yml b/playbooks/groups/docker-registry.yml index 50697da5a6..de65d4fa66 100644 --- a/playbooks/groups/docker-registry.yml +++ b/playbooks/groups/docker-registry.yml @@ -1,5 +1,5 @@ # create an osbs server -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=docker-registry:docker-registry-stg" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=docker-registry:docker-registry-stg" - name: make the box be real hosts: docker-registry:docker-registry-stg @@ -24,12 +24,12 @@ when: env != "staging" } tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: set up gluster on stg hosts: diff --git a/playbooks/groups/download.yml b/playbooks/groups/download.yml index 031521eeef..e00787fd17 100644 --- a/playbooks/groups/download.yml +++ b/playbooks/groups/download.yml @@ -1,4 +1,4 @@ -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=download-ibiblio" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=download-ibiblio" - name: Download servers hosts: download @@ -13,7 +13,7 @@ tasks: handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: post-initial-steps @@ -44,9 +44,9 @@ - { role: openvpn/client, when: datacenter != "phx2" } tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" - name: put in script for syncing on download-ib01 copy: src="{{ files }}/download/sync-up-downloads.sh.ib01" dest=/usr/local/bin/sync-up-downloads owner=root group=root mode=755 @@ -68,5 +68,5 @@ handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/elections.yml b/playbooks/groups/elections.yml index 2cf9e747d4..d1b8217eb2 100644 --- a/playbooks/groups/elections.yml +++ b/playbooks/groups/elections.yml @@ -1,4 +1,4 @@ -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=elections:elections-stg" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=elections:elections-stg" - name: make the box be real hosts: elections:elections-stg @@ -24,12 +24,12 @@ - collectd/base tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: set up fedmsg on elections hosts: elections:elections-stg @@ -45,7 +45,7 @@ - fedmsg/base handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: deploy elections itself hosts: elections:elections-stg @@ -61,5 +61,5 @@ - elections handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/fas.yml b/playbooks/groups/fas.yml index fedc4c00d1..4b11497109 100644 --- a/playbooks/groups/fas.yml +++ b/playbooks/groups/fas.yml @@ -1,6 +1,6 @@ # create a new fas server -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=fas:fas-stg" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=fas:fas-stg" - name: make the box be real hosts: fas-stg:fas @@ -30,9 +30,9 @@ - { role: openvpn/client, when: env != "staging" } tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/fas3.yml b/playbooks/groups/fas3.yml index f6ea71da03..0ee783015c 100644 --- a/playbooks/groups/fas3.yml +++ b/playbooks/groups/fas3.yml @@ -1,6 +1,6 @@ # create a new fas server -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=fas3-stg" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=fas3-stg" - name: make the box be real hosts: fas3-stg @@ -30,9 +30,9 @@ #- { role: openvpn/client, when: env != "staging" } tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/fedimg.yml b/playbooks/groups/fedimg.yml index abddaeac93..88d7aaea6c 100644 --- a/playbooks/groups/fedimg.yml +++ b/playbooks/groups/fedimg.yml @@ -1,7 +1,7 @@ # create a new fedimg server # NOTE: make sure there is room/space for this server on the vmhost -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=fedimg:fedimg-stg" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=fedimg:fedimg-stg" - name: dole out the generic configuration hosts: fedimg:fedimg-stg @@ -28,12 +28,12 @@ # when: env != "staging" } tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: dole out the service-specific config hosts: fedimg:fedimg-stg @@ -61,4 +61,4 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/fedocal.yml b/playbooks/groups/fedocal.yml index 3fefb8a33f..b24ccced70 100644 --- a/playbooks/groups/fedocal.yml +++ b/playbooks/groups/fedocal.yml @@ -1,4 +1,4 @@ -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=fedocal-stg:fedocal" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=fedocal-stg:fedocal" - name: make the box be real hosts: fedocal-stg:fedocal @@ -24,12 +24,12 @@ - collectd/base tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: set up fedmsg hosts: fedocal-stg:fedocal @@ -45,7 +45,7 @@ - fedmsg/base handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: deploy fedocal itself hosts: fedocal-stg:fedocal @@ -61,4 +61,4 @@ - fedocal handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/freshmaker.yml b/playbooks/groups/freshmaker.yml index 39d669c833..efafe0743d 100644 --- a/playbooks/groups/freshmaker.yml +++ b/playbooks/groups/freshmaker.yml @@ -1,4 +1,4 @@ -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=freshmaker:freshmaker-stg" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=freshmaker:freshmaker-stg" - name: make the box be real hosts: freshmaker:freshmaker-stg @@ -11,7 +11,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" roles: - base @@ -24,11 +24,11 @@ - collectd/base tasks: - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: openvpn on the prod frontend nodes hosts: freshmaker-frontend @@ -44,7 +44,7 @@ - openvpn/client handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: Set up apache on the frontend MBS API app hosts: freshmaker-frontend:freshmaker-frontend-stg @@ -60,7 +60,7 @@ - mod_wsgi handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: set up fedmsg configuration and common freshmaker files hosts: freshmaker:freshmaker-stg @@ -76,4 +76,4 @@ - fedmsg/base handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/github2fedmsg.yml b/playbooks/groups/github2fedmsg.yml index 05da0da440..de63d753ec 100644 --- a/playbooks/groups/github2fedmsg.yml +++ b/playbooks/groups/github2fedmsg.yml @@ -3,7 +3,7 @@ # NOTE: make sure there is room/space for this server on the vmhost # NOTE: most of these vars_path come from group_vars/github2fedmsg* or from hostvars -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=github2fedmsg:github2fedmsg-stg" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=github2fedmsg:github2fedmsg-stg" - name: make the box be real hosts: github2fedmsg:github2fedmsg-stg @@ -29,12 +29,12 @@ - mod_wsgi tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: deploy service-specific config hosts: github2fedmsg:github2fedmsg-stg @@ -47,7 +47,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" roles: - github2fedmsg diff --git a/playbooks/groups/gnome-backups.yml b/playbooks/groups/gnome-backups.yml index 4168fd5dac..224dc9a4cf 100644 --- a/playbooks/groups/gnome-backups.yml +++ b/playbooks/groups/gnome-backups.yml @@ -1,4 +1,4 @@ -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=gnome-backups" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=gnome-backups" - name: make the boxen be real for real hosts: gnome-backups @@ -25,9 +25,9 @@ nfs_src_dir: 'gnome_backups' } tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/hosted.yml b/playbooks/groups/hosted.yml index 29aa110475..21c8b6e8be 100644 --- a/playbooks/groups/hosted.yml +++ b/playbooks/groups/hosted.yml @@ -1,4 +1,4 @@ -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=newhosted" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=newhosted" - name: make the boxen be real for real hosts: newhosted @@ -21,9 +21,9 @@ - openvpn/client tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/hotness.yml b/playbooks/groups/hotness.yml index abc5c69315..58c9a96222 100644 --- a/playbooks/groups/hotness.yml +++ b/playbooks/groups/hotness.yml @@ -3,7 +3,7 @@ # NOTE: make sure there is room/space for this server on the vmhost # NOTE: most of these vars_path come from group_vars/mirrorlist or from hostvars -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=hotness:hotness-stg" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=hotness:hotness-stg" - name: dole out the generic configuration hosts: hotness:hotness-stg @@ -32,12 +32,12 @@ # when: env != "staging" } tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: set up fedmsg basics hosts: hotness:hotness-stg @@ -53,7 +53,7 @@ - fedmsg/base handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: dole out the service-specific config hosts: hotness:hotness-stg @@ -72,4 +72,4 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/infinote.yml b/playbooks/groups/infinote.yml index f503a46dd8..149bfb336e 100644 --- a/playbooks/groups/infinote.yml +++ b/playbooks/groups/infinote.yml @@ -1,5 +1,5 @@ # create a new infinote server -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=infinote" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=infinote" - name: make the boxen be real for real hosts: infinote @@ -29,9 +29,9 @@ - infinote tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/ipa.yml b/playbooks/groups/ipa.yml index 05a5c5db79..41c6f068fe 100644 --- a/playbooks/groups/ipa.yml +++ b/playbooks/groups/ipa.yml @@ -1,4 +1,4 @@ -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=ipa:ipa-stg" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=ipa:ipa-stg" - name: make the box be real hosts: ipa:ipa-stg @@ -23,12 +23,12 @@ - mod_wsgi tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: deploy ipa itself hosts: ipa:ipa-stg @@ -51,7 +51,7 @@ - combine IPA http keytabs handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - name: Combine IPA keytabs @@ -100,4 +100,4 @@ - base handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/ipsilon.yml b/playbooks/groups/ipsilon.yml index 8f7cbcfb04..6cd0c9b959 100644 --- a/playbooks/groups/ipsilon.yml +++ b/playbooks/groups/ipsilon.yml @@ -3,7 +3,7 @@ # NOTE: make sure there is room/space for this server on the vmhost # NOTE: most of these vars_path come from group_vars/ipsilon* or from hostvars -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=ipsilon:ipsilon-stg" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=ipsilon:ipsilon-stg" - name: make the box be real hosts: ipsilon:ipsilon-stg @@ -40,12 +40,12 @@ when: env == "production" tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: deploy ipsilon itself hosts: ipsilon:ipsilon-stg @@ -61,4 +61,4 @@ - ipsilon handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/jenkins-master.yml b/playbooks/groups/jenkins-master.yml index 6eec92cd46..01b892c2c2 100644 --- a/playbooks/groups/jenkins-master.yml +++ b/playbooks/groups/jenkins-master.yml @@ -9,7 +9,7 @@ - /srv/private/ansible/files/openstack/passwords.yml tasks: - - include: "{{ tasks_path }}/persistent_cloud.yml" + - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" - name: setup all the things hosts: jenkins-master @@ -21,10 +21,10 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks_path }}/cloud_setup_basic.yml" + - include_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" - - include: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" - name: provision instance hosts: jenkins-master @@ -41,8 +41,8 @@ - certbot tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/jenkins-slave.yml b/playbooks/groups/jenkins-slave.yml index 0adfd4021f..e92c84b1ea 100644 --- a/playbooks/groups/jenkins-slave.yml +++ b/playbooks/groups/jenkins-slave.yml @@ -9,7 +9,7 @@ - /srv/private/ansible/files/openstack/passwords.yml tasks: - - include: "{{ tasks_path }}/persistent_cloud.yml" + - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" - name: setup all the things hosts: jenkins-slave @@ -21,10 +21,10 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks_path }}/cloud_setup_basic.yml" + - include_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" - - include: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" - name: provision instance hosts: jenkins-slave @@ -39,9 +39,9 @@ - jenkins/slave tasks: -# - include: "{{ tasks_path }}/growroot_cloud.yml" - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/motd.yml" +# - include_tasks: "{{ tasks_path }}/growroot_cloud.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/kerneltest.yml b/playbooks/groups/kerneltest.yml index 54908ab364..3928a341c6 100644 --- a/playbooks/groups/kerneltest.yml +++ b/playbooks/groups/kerneltest.yml @@ -3,7 +3,7 @@ # NOTE: make sure there is room/space for this server on the vmhost # NOTE: most of these vars_path come from group_vars/kerneltest* or from hostvars -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=kerneltest:kerneltest-stg" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=kerneltest:kerneltest-stg" - name: make the box be real hosts: kerneltest-stg:kerneltest @@ -29,12 +29,12 @@ - mod_wsgi tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: deploy service-specific config hosts: kerneltest-stg:kerneltest @@ -47,7 +47,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" roles: - kerneltest diff --git a/playbooks/groups/keyserver.yml b/playbooks/groups/keyserver.yml index 2707c77053..2747e12b32 100644 --- a/playbooks/groups/keyserver.yml +++ b/playbooks/groups/keyserver.yml @@ -3,7 +3,7 @@ # NOTE: make sure there is room/space for this server on the vmhost # NOTE: most of these vars_path come from group_vars/gallery-web* or from hostvars -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=keys" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=keys" - name: make the box be real hosts: keys @@ -30,9 +30,9 @@ - keyserver tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/koji-hub.yml b/playbooks/groups/koji-hub.yml index 4f7d3e669c..39e7301687 100644 --- a/playbooks/groups/koji-hub.yml +++ b/playbooks/groups/koji-hub.yml @@ -2,7 +2,7 @@ # NOTE: should be used with --limit most of the time # NOTE: most of these vars_path come from group_vars/koji-hub or from hostvars -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=koji-stg:koji" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=koji-stg:koji" # Once the instance exists, configure it. @@ -17,8 +17,8 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks_path }}/osbs_certs.yml" - - include: "{{ tasks_path }}/osbs_repos.yml" + - include_tasks: "{{ tasks_path }}/osbs_certs.yml" + - include_tasks: "{{ tasks_path }}/osbs_repos.yml" roles: - base @@ -82,12 +82,12 @@ file: src=/mnt/fedora_koji_prod/koji dest=/mnt/koji/vol/prod state=link tags: koji_hub when: env == 'staging' - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" #- name: Start the kojid builder daemon, but only on staging. diff --git a/playbooks/groups/kojipkgs.yml b/playbooks/groups/kojipkgs.yml index fd330e2457..8346f40217 100644 --- a/playbooks/groups/kojipkgs.yml +++ b/playbooks/groups/kojipkgs.yml @@ -1,4 +1,4 @@ -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=kojipkgs" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=kojipkgs" - name: make the boxen be real for real hosts: kojipkgs @@ -32,9 +32,9 @@ - role: varnish tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/koschei-backend.yml b/playbooks/groups/koschei-backend.yml index b96b3df55a..d1a6e5209c 100644 --- a/playbooks/groups/koschei-backend.yml +++ b/playbooks/groups/koschei-backend.yml @@ -1,4 +1,4 @@ -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=koschei-backend:koschei-backend-stg" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=koschei-backend:koschei-backend-stg" - name: install koschei hosts: koschei-backend:koschei-backend-stg @@ -11,7 +11,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" roles: - base @@ -31,8 +31,8 @@ - fedmsg/base tasks: - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/koschei-web.yml b/playbooks/groups/koschei-web.yml index 047011bbd5..49781aea7c 100644 --- a/playbooks/groups/koschei-web.yml +++ b/playbooks/groups/koschei-web.yml @@ -1,5 +1,5 @@ --- -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=koschei-web:koschei-web-stg" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=koschei-web:koschei-web-stg" - name: install koschei-frontend hosts: koschei-web:koschei-web-stg @@ -24,9 +24,9 @@ - koschei/frontend tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/logserver.yml b/playbooks/groups/logserver.yml index d36cd9facd..4c8d38f47e 100644 --- a/playbooks/groups/logserver.yml +++ b/playbooks/groups/logserver.yml @@ -1,4 +1,4 @@ -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=log01.phx2.fedoraproject.org" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=log01.phx2.fedoraproject.org" - name: make the box be real hosts: log01.phx2.fedoraproject.org @@ -31,9 +31,9 @@ when: env == "production" tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" # # We exclude some dirs from restorecon on updates on logservers as they are very large @@ -43,7 +43,7 @@ copy: src="{{ files }}/logserver/fixfiles_exclude_dirs" dest=/etc/selinux/fixfiles_exclude_dirs owner=root mode=0644 handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: Cloud Image stats hosts: log01.phx2.fedoraproject.org @@ -63,4 +63,4 @@ nfs_src_dir: 'fedora_stats' handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/loopabull.yml b/playbooks/groups/loopabull.yml index 59e65daae6..dbd04aef6a 100644 --- a/playbooks/groups/loopabull.yml +++ b/playbooks/groups/loopabull.yml @@ -1,5 +1,5 @@ # create a new loopabull server -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=loopabull-stg" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=loopabull-stg" - name: make the box be real hosts: loopabull-stg @@ -12,7 +12,7 @@ - "/srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml" pre_tasks: - - include: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" roles: - base @@ -24,11 +24,11 @@ - sudo tasks: - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: Deploy and configure loopabull hosts: loopabull-stg @@ -41,7 +41,7 @@ - "/srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - name: git clone the releng-automation playbook repo @@ -90,7 +90,7 @@ - "/srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - name: Enable fedmsg-rabbitmq-serializer diff --git a/playbooks/groups/mailman.yml b/playbooks/groups/mailman.yml index 61a87bb5cc..234341891a 100644 --- a/playbooks/groups/mailman.yml +++ b/playbooks/groups/mailman.yml @@ -2,7 +2,7 @@ # NOTE: make sure there is room/space for this server on the vmhost # NOTE: most of these vars_path come from group_vars/mirrorlist or from hostvars -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=mailman:mailman-stg" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=mailman:mailman-stg" - name: make the box be real hosts: mailman-stg:mailman @@ -29,12 +29,12 @@ tasks: # this is how you include other task lists - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" # @@ -119,4 +119,4 @@ when: inventory_hostname.startswith('mailman01.phx2') or inventory_hostname.startswith('lists-dev') handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/maintainer-test.yml b/playbooks/groups/maintainer-test.yml index 566ad58d69..624f3de44b 100644 --- a/playbooks/groups/maintainer-test.yml +++ b/playbooks/groups/maintainer-test.yml @@ -9,7 +9,7 @@ - /srv/private/ansible/files/openstack/passwords.yml tasks: - - include: "{{ tasks_path }}/persistent_cloud.yml" + - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" - name: Do some basic cloud setup on them hosts: maintainer-test @@ -21,7 +21,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks_path }}/cloud_setup_basic.yml" + - include_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" @@ -37,7 +37,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" roles: - base @@ -48,7 +48,7 @@ tasks: # this is how you include other task lists - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" - name: install packager tools (dnf) dnf: state=present pkg={{ item }} @@ -68,4 +68,4 @@ - config handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/mariadb-server.yml b/playbooks/groups/mariadb-server.yml index 3633f4219d..dd33185367 100644 --- a/playbooks/groups/mariadb-server.yml +++ b/playbooks/groups/mariadb-server.yml @@ -2,7 +2,7 @@ # NOTE: should be used with --limit most of the time # NOTE: most of these vars_path come from group_vars/backup_server or from hostvars -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=db03.phx2.fedoraproject.org:db03.stg.phx2.fedoraproject.org" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=db03.phx2.fedoraproject.org:db03.stg.phx2.fedoraproject.org" # Once the instance exists, configure it. @@ -27,11 +27,11 @@ - sudo tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" # TODO: add iscsi task handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/mbs.yml b/playbooks/groups/mbs.yml index 69edb91f7f..585308ae98 100644 --- a/playbooks/groups/mbs.yml +++ b/playbooks/groups/mbs.yml @@ -1,4 +1,4 @@ -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=mbs:mbs-stg" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=mbs:mbs-stg" - name: make the box be real hosts: mbs:mbs-stg @@ -11,7 +11,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" roles: - base @@ -24,11 +24,11 @@ - collectd/base tasks: - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: openvpn on the prod frontend nodes hosts: mbs-frontend @@ -44,7 +44,7 @@ - openvpn/client handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: Set up apache on the frontend MBS API app hosts: mbs-frontend:mbs-frontend-stg @@ -60,7 +60,7 @@ - mod_wsgi handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: set up fedmsg configuration and common mbs files hosts: mbs:mbs-stg @@ -77,7 +77,7 @@ - mbs/common handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: deploy the frontend MBS API app hosts: mbs-frontend:mbs-frontend-stg @@ -93,7 +93,7 @@ - mbs/frontend handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: deploy the backend MBS scheduler daemon hosts: mbs-backend:mbs-backend-stg @@ -119,4 +119,4 @@ #- mbs/backend handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/mdapi.yml b/playbooks/groups/mdapi.yml index f6f9a2046b..58db4c021a 100644 --- a/playbooks/groups/mdapi.yml +++ b/playbooks/groups/mdapi.yml @@ -1,4 +1,4 @@ -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=mdapi:mdapi-stg" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=mdapi:mdapi-stg" - name: make the box be real hosts: mdapi-stg:mdapi @@ -11,7 +11,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" roles: - base @@ -27,11 +27,11 @@ - { role: mod_wsgi, when: env == "staging" } tasks: - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: deploy mdapi itself hosts: mdapi-stg:mdapi @@ -48,7 +48,7 @@ - { role: plus-plus-service, when: env == "staging" } handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: set up fedmsg hosts: mdapi-stg:mdapi @@ -64,4 +64,4 @@ - fedmsg/base handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/memcached.yml b/playbooks/groups/memcached.yml index e8dfb20e30..b1cff10554 100644 --- a/playbooks/groups/memcached.yml +++ b/playbooks/groups/memcached.yml @@ -1,4 +1,4 @@ -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=memcached:memcached-stg" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=memcached:memcached-stg" - name: make the box be real hosts: memcached:memcached-stg @@ -22,9 +22,9 @@ - memcached tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/mirrorlist2.yml b/playbooks/groups/mirrorlist2.yml index 57f34775aa..6d0fa43859 100644 --- a/playbooks/groups/mirrorlist2.yml +++ b/playbooks/groups/mirrorlist2.yml @@ -3,7 +3,7 @@ # NOTE: make sure there is room/space for this server on the vmhost # NOTE: most of these vars_path come from group_vars/mirrorlist or from hostvars -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=mirrorlist2:mirrorlist2-stg:!mirrorlist-host1plus.fedoraproject.org" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=mirrorlist2:mirrorlist2-stg:!mirrorlist-host1plus.fedoraproject.org" - name: make the box be real hosts: mirrorlist2:mirrorlist2-stg @@ -64,10 +64,10 @@ tasks: # this is how you include other task lists - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/mirrormanager.yml b/playbooks/groups/mirrormanager.yml index 746ae1a45a..85cca92cc3 100644 --- a/playbooks/groups/mirrormanager.yml +++ b/playbooks/groups/mirrormanager.yml @@ -1,4 +1,4 @@ -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=mm:mm-stg" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=mm:mm-stg" - name: make the boxe be real for real hosts: mm:mm-stg @@ -22,12 +22,12 @@ - { role: nfs/client, when: inventory_hostname.startswith('mm-backend01'), mnt_dir: '/srv/pub', nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub' } tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: Deploy the backend hosts: mm-backend:mm-backend-stg @@ -45,7 +45,7 @@ - geoip handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: Deploy the crawler hosts: mm-crawler:mm-crawler-stg @@ -64,7 +64,7 @@ - { role: openvpn/client, when: datacenter != "phx2" } handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: Deploy the frontend (web-app) hosts: mm-frontend:mm-frontend-stg @@ -80,7 +80,7 @@ - mirrormanager/frontend2 handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" # Do this one last, since the mirrormanager user needs to exist so that it can # own the fedmsg certs we put in place here. @@ -98,4 +98,4 @@ - fedmsg/base handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/modernpaste.yml b/playbooks/groups/modernpaste.yml index 0b7b2bd514..aa7ad4a166 100644 --- a/playbooks/groups/modernpaste.yml +++ b/playbooks/groups/modernpaste.yml @@ -3,7 +3,7 @@ # NOTE: make sure there is room/space for this server on the vmhost # NOTE: most of these vars_path come from group_vars/mirrorlist or from hostvars -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=modernpaste-stg:modernpaste" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=modernpaste-stg:modernpaste" - name: dole out the generic configuration hosts: modernpaste-stg:modernpaste @@ -27,12 +27,12 @@ - { role: openvpn/client, when: env != "staging" } tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: dole out the service-specific config hosts: modernpaste-stg:modernpaste @@ -48,4 +48,4 @@ - "{{ vars_path }}/{{ ansible_distribution }}.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/noc.yml b/playbooks/groups/noc.yml index 753d367eef..495ee62734 100644 --- a/playbooks/groups/noc.yml +++ b/playbooks/groups/noc.yml @@ -1,5 +1,5 @@ # This is a basic playbook -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=nagios" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=nagios" - name: make the box be real hosts: nagios @@ -12,7 +12,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" roles: - base @@ -41,11 +41,11 @@ tasks: - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: deploy service-specific config (just for production) hosts: nagios @@ -58,7 +58,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" roles: - { role: dhcp_server, when: datacenter == 'phx2' } diff --git a/playbooks/groups/notifs-backend.yml b/playbooks/groups/notifs-backend.yml index 4bd46b99bf..ea99d7f78a 100644 --- a/playbooks/groups/notifs-backend.yml +++ b/playbooks/groups/notifs-backend.yml @@ -3,7 +3,7 @@ # NOTE: make sure there is room/space for this server on the vmhost # NOTE: most of these vars_path come from group_vars/mirrorlist or from hostvars -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=notifs-backend:notifs-backend-stg" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=notifs-backend:notifs-backend-stg" - name: dole out the generic configuration hosts: notifs-backend:notifs-backend-stg @@ -30,12 +30,12 @@ # when: env != "staging" } tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: dole out the service-specific config hosts: notifs-backend:notifs-backend-stg @@ -66,4 +66,4 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/notifs-web.yml b/playbooks/groups/notifs-web.yml index 784a6f9764..8ba9b8728d 100644 --- a/playbooks/groups/notifs-web.yml +++ b/playbooks/groups/notifs-web.yml @@ -3,7 +3,7 @@ # NOTE: make sure there is room/space for this server on the vmhost # NOTE: most of these vars_path come from group_vars/notifs-web* or from hostvars -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=notifs-web:notifs-web-stg" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=notifs-web:notifs-web-stg" - name: make the box be real hosts: notifs-web:notifs-web-stg @@ -30,9 +30,9 @@ when: env != "staging" } tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/nuancier.yml b/playbooks/groups/nuancier.yml index d34748d700..f2fa04f7b7 100644 --- a/playbooks/groups/nuancier.yml +++ b/playbooks/groups/nuancier.yml @@ -3,7 +3,7 @@ # NOTE: make sure there is room/space for this server on the vmhost # NOTE: most of these vars_path come from group_vars/nuancier* or from hostvars -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=nuancier:nuancier-stg" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=nuancier:nuancier-stg" - name: make the box be real hosts: nuancier:nuancier-stg @@ -28,12 +28,12 @@ - mod_wsgi tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: set up fedmsg hosts: nuancier:nuancier-stg @@ -49,7 +49,7 @@ - fedmsg/base handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: set up gluster on stg hosts: nuancier-stg @@ -125,4 +125,4 @@ - nuancier handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/odcs.yml b/playbooks/groups/odcs.yml index 9814eae7a1..54cc6ae3d2 100644 --- a/playbooks/groups/odcs.yml +++ b/playbooks/groups/odcs.yml @@ -1,4 +1,4 @@ -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=odcs:odcs-stg" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=odcs:odcs-stg" - name: make the box be real hosts: odcs:odcs-stg @@ -11,7 +11,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" roles: - base @@ -24,11 +24,11 @@ - collectd/base tasks: - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: openvpn on the prod frontend nodes hosts: odcs-frontend @@ -44,7 +44,7 @@ - openvpn/client handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: Set up a gluster share on the backend for the frontend hosts: odcs:odcs-stg @@ -88,7 +88,7 @@ - odcs/frontend handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: Set up odcs backend service hosts: odcs-backend:odcs-backend-stg @@ -116,4 +116,4 @@ when: env == 'staging' handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/openqa-workers.yml b/playbooks/groups/openqa-workers.yml index 0966aa8667..f2a08ed599 100644 --- a/playbooks/groups/openqa-workers.yml +++ b/playbooks/groups/openqa-workers.yml @@ -20,9 +20,9 @@ - apache tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/openqa.yml b/playbooks/groups/openqa.yml index 15066ea00d..828f411e06 100644 --- a/playbooks/groups/openqa.yml +++ b/playbooks/groups/openqa.yml @@ -1,4 +1,4 @@ -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=openqa:openqa-stg" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=openqa:openqa-stg" - name: setup base openqa host hosts: openqa:openqa-stg @@ -23,12 +23,12 @@ - apache tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: configure openQA hosts: openqa:openqa-stg @@ -54,7 +54,7 @@ - { role: autocloudreporter, tags: ['autocloudreporter'] } handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: set up openQA server data NFS mounts (staging) hosts: openqa-stg @@ -77,7 +77,7 @@ tags: ['nfs_client'] handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: set up openQA server data NFS mounts (prod) hosts: openqa @@ -100,4 +100,4 @@ tags: ['nfs_client'] handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/openstack-compute-nodes.yml b/playbooks/groups/openstack-compute-nodes.yml index 503dca2a34..1314bf1934 100644 --- a/playbooks/groups/openstack-compute-nodes.yml +++ b/playbooks/groups/openstack-compute-nodes.yml @@ -21,9 +21,9 @@ - cloud_compute tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/os-cluster.yml b/playbooks/groups/os-cluster.yml index 2b406016a9..c6f7f23ea7 100644 --- a/playbooks/groups/os-cluster.yml +++ b/playbooks/groups/os-cluster.yml @@ -1,5 +1,5 @@ # create an os server -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=os-control-stg:os-control:os-nodes-stg:os-masters-stg:os-nodes:os-masters" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=os-control-stg:os-control:os-nodes-stg:os-masters-stg:os-nodes:os-masters" - name: make the box be real hosts: os-control:os-control-stg:os-masters-stg:os-nodes-stg:os-masters:os-nodes @@ -42,12 +42,12 @@ dest: "/etc/sysconfig/docker-storage-setup" - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: OSBS control hosts pre-req setup hosts: os-control:os-control-stg diff --git a/playbooks/groups/osbs-cluster.yml b/playbooks/groups/osbs-cluster.yml index 4f405fc561..2375f8585c 100644 --- a/playbooks/groups/osbs-cluster.yml +++ b/playbooks/groups/osbs-cluster.yml @@ -1,6 +1,6 @@ # create an osbs server -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=osbs-control" -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=osbs-nodes:osbs-masters" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=osbs-control" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=osbs-nodes:osbs-masters" - name: make the box be real hosts: osbs-control:osbs-masters:osbs-nodes @@ -23,12 +23,12 @@ - sudo tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: OSBS control hosts pre-req setup hosts: osbs-control diff --git a/playbooks/groups/osbs-orchestrator-cluster.yml b/playbooks/groups/osbs-orchestrator-cluster.yml index a8d12c6035..931c9de794 100644 --- a/playbooks/groups/osbs-orchestrator-cluster.yml +++ b/playbooks/groups/osbs-orchestrator-cluster.yml @@ -1,5 +1,5 @@ # create an osbs server -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=osbs-stg" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=osbs-stg" tags: - make_boxes @@ -24,12 +24,12 @@ - sudo tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" # Prepare the Control host to be able to run ansible-ansible-openshift-ansible # against the Orchestration and Worker cluster machines diff --git a/playbooks/groups/packages.yml b/playbooks/groups/packages.yml index b4946e0cd4..46a51c75f8 100644 --- a/playbooks/groups/packages.yml +++ b/playbooks/groups/packages.yml @@ -3,7 +3,7 @@ # NOTE: make sure there is room/space for this server on the vmhost # NOTE: most of these vars_path come from group_vars/packages* or from hostvars -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=packages:packages-stg" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=packages:packages-stg" - name: make the box be real hosts: packages:packages-stg @@ -16,7 +16,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" roles: - base @@ -32,11 +32,11 @@ - mod_wsgi tasks: - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: set up gluster server on prod hosts: packages @@ -58,7 +58,7 @@ datadir: /srv/glusterfs/packages handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: set up gluster client on prod hosts: packages @@ -84,7 +84,7 @@ mountdir: /var/cache/fedoracommunity handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: dole out the new service specific config hosts: packages:packages-stg @@ -103,4 +103,4 @@ process: fedmsg-hub handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/pagure.yml b/playbooks/groups/pagure.yml index 760a801d62..5851b8ebae 100644 --- a/playbooks/groups/pagure.yml +++ b/playbooks/groups/pagure.yml @@ -1,4 +1,4 @@ -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=pagure:pagure-stg" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=pagure:pagure-stg" - name: make the boxen be real for real hosts: pagure:pagure-stg @@ -22,12 +22,12 @@ - postgresql_server tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: deploy pagure itself hosts: pagure:pagure-stg @@ -56,4 +56,4 @@ - pagure/fedmsg handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/paste.yml b/playbooks/groups/paste.yml index 0d02d948cf..0e81cf59ec 100644 --- a/playbooks/groups/paste.yml +++ b/playbooks/groups/paste.yml @@ -1,4 +1,4 @@ -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=paste:paste-stg" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=paste:paste-stg" - name: make the box be real hosts: paste-stg:paste @@ -25,9 +25,9 @@ when: env != "staging" } tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/pdc.yml b/playbooks/groups/pdc.yml index 1e46069a4b..93df2254fe 100644 --- a/playbooks/groups/pdc.yml +++ b/playbooks/groups/pdc.yml @@ -1,6 +1,6 @@ # PDC servers (both frontend and backend) -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=pdc-web:pdc-web-stg:pdc-backend:pdc-backend-stg" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=pdc-web:pdc-web-stg:pdc-backend:pdc-backend-stg" - name: dole out the generic configuration hosts: pdc-web:pdc-web-stg:pdc-backend:pdc-backend-stg @@ -11,7 +11,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" roles: - base @@ -23,9 +23,9 @@ - sudo tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" - name: stuff for the web nodes hosts: pdc-web:pdc-web-stg @@ -36,7 +36,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" roles: - role: openvpn/client @@ -54,7 +54,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" roles: - fedmsg/base diff --git a/playbooks/groups/people.yml b/playbooks/groups/people.yml index 769dbc8d70..26d528f9ab 100644 --- a/playbooks/groups/people.yml +++ b/playbooks/groups/people.yml @@ -1,7 +1,7 @@ # Create a people server # # -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=people" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=people" - name: make the box be real hosts: people @@ -81,9 +81,9 @@ - people tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/piwik.yml b/playbooks/groups/piwik.yml index 1f89218a60..f0592ebccd 100644 --- a/playbooks/groups/piwik.yml +++ b/playbooks/groups/piwik.yml @@ -1,6 +1,6 @@ # These servers run piwik -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=piwik-stg" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=piwik-stg" - name: make the box be real hosts: piwik-stg @@ -25,9 +25,9 @@ - sudo tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/pkgdb.yml b/playbooks/groups/pkgdb.yml index 98d211e6d9..211be8f2ae 100644 --- a/playbooks/groups/pkgdb.yml +++ b/playbooks/groups/pkgdb.yml @@ -2,7 +2,7 @@ # NOTE: should be used with --limit most of the time # NOTE: make sure there is room/space for this server on the vmhost # NOTE: most of these vars_path come from group_vars/pkgdb* or from hostvars -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=pkgdb:pkgdb-stg" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=pkgdb:pkgdb-stg" - name: make the box be real hosts: pkgdb-stg:pkgdb @@ -27,12 +27,12 @@ - mod_wsgi tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: set up fedmsg on pkgdb hosts: pkgdb-stg:pkgdb @@ -48,7 +48,7 @@ - fedmsg/base handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: deploy pkgdb itself hosts: pkgdb-stg:pkgdb @@ -64,4 +64,4 @@ - pkgdb2 handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/pkgs.yml b/playbooks/groups/pkgs.yml index ba584ca10b..e30c027d4d 100644 --- a/playbooks/groups/pkgs.yml +++ b/playbooks/groups/pkgs.yml @@ -1,4 +1,4 @@ -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=pkgs-stg:pkgs02.phx2.fedoraproject.org" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=pkgs-stg:pkgs02.phx2.fedoraproject.org" - name: make the box be real hosts: pkgs-stg:pkgs02.phx2.fedoraproject.org @@ -50,12 +50,12 @@ tags: - krb5 - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/motd.yml" - - include: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: setup fedmsg on pkgs hosts: pkgs-stg:pkgs02.phx2.fedoraproject.org @@ -73,4 +73,4 @@ - fedmsg/hub handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/postgresql-server-bdr.yml b/playbooks/groups/postgresql-server-bdr.yml index d07290b3b3..9dc813c89c 100644 --- a/playbooks/groups/postgresql-server-bdr.yml +++ b/playbooks/groups/postgresql-server-bdr.yml @@ -2,7 +2,7 @@ # NOTE: should be used with --limit most of the time # NOTE: most of these vars_path come from group_vars/backup_server or from hostvars -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=db-koji01.stg.phx2.fedoraproject.org:db-koji02.stg.phx2.fedoraproject.org:pgbdr01.stg.phx2.fedoraproject.org:pgbdr02.stg.phx2.fedoraproject.org" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=db-koji01.stg.phx2.fedoraproject.org:db-koji02.stg.phx2.fedoraproject.org:pgbdr01.stg.phx2.fedoraproject.org:pgbdr02.stg.phx2.fedoraproject.org" # Once the instance exists, configure it. @@ -29,11 +29,11 @@ - postgresql_server_bdr tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" # TODO: add iscsi task handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/postgresql-server.yml b/playbooks/groups/postgresql-server.yml index a91081b811..9991adfca1 100644 --- a/playbooks/groups/postgresql-server.yml +++ b/playbooks/groups/postgresql-server.yml @@ -2,7 +2,7 @@ # NOTE: should be used with --limit most of the time # NOTE: most of these vars_path come from group_vars/backup_server or from hostvars -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=db-datanommer01.phx2.fedoraproject.org:db-datanommer02.phx2.fedoraproject.org:db-qa01.qa.fedoraproject.org:db-koji01.phx2.fedoraproject.org:db-fas01.stg.phx2.fedoraproject.org:db-fas01.phx2.fedoraproject.org:db01.phx2.fedoraproject.org:db01.stg.phx2.fedoraproject.org:db-s390-koji01.s390.fedoraproject.org:db-arm-koji01.qa.fedoraproject.org:db-ppc-koji01.ppc.fedoraproject.org:db-qa-stg01.qa.fedoraproject.org:db-qa02.qa.fedoraproject.org" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=db-datanommer01.phx2.fedoraproject.org:db-datanommer02.phx2.fedoraproject.org:db-qa01.qa.fedoraproject.org:db-koji01.phx2.fedoraproject.org:db-fas01.stg.phx2.fedoraproject.org:db-fas01.phx2.fedoraproject.org:db01.phx2.fedoraproject.org:db01.stg.phx2.fedoraproject.org:db-s390-koji01.s390.fedoraproject.org:db-arm-koji01.qa.fedoraproject.org:db-ppc-koji01.ppc.fedoraproject.org:db-qa-stg01.qa.fedoraproject.org:db-qa02.qa.fedoraproject.org" # Once the instance exists, configure it. @@ -17,7 +17,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" roles: - base @@ -32,10 +32,10 @@ - { role: openvpn/client, when: inventory_hostname == "db-fas01.phx2.fedoraproject.org" or inventory_hostname == "db01.phx2.fedoraproject.org" } tasks: - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" # TODO: add iscsi task handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/proxies.yml b/playbooks/groups/proxies.yml index da95bd15f1..6a4a071ecc 100644 --- a/playbooks/groups/proxies.yml +++ b/playbooks/groups/proxies.yml @@ -1,6 +1,6 @@ # create a new proxy server -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=proxies:proxies-stg:!proxy07.fedoraproject.org:!proxy05.fedoraproject.org" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=proxies:proxies-stg:!proxy07.fedoraproject.org:!proxy05.fedoraproject.org" - name: make the box be real hosts: proxies-stg:proxies @@ -47,18 +47,18 @@ state=link when: inventory_hostname == 'proxy01.phx2.fedoraproject.org' - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" # You might think we would want these tasks_path on the proxy nodes, but they # actually deliver a configuration that our proxy-specific roles below then go # and overwrite... so, let's just leave them out. - #- include: "{{ tasks_path }}/apache.yml" - #- include: "{{ tasks_path }}/mod_wsgi.yml" + #- include_tasks: "{{ tasks_path }}/apache.yml" + #- include_tasks: "{{ tasks_path }}/mod_wsgi.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" # TODO @@ -90,7 +90,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" pre_tasks: # @@ -169,15 +169,15 @@ # out the proxy-specific configuration into a couple different sub-playbooks. # Othewise, this file would be unbearably long. -- include: /srv/web/infra/ansible/playbooks/include/proxies-certificates.yml -- include: /srv/web/infra/ansible/playbooks/include/proxies-websites.yml -- include: /srv/web/infra/ansible/playbooks/include/proxies-fedorahosted.yml -- include: /srv/web/infra/ansible/playbooks/include/proxies-fedora-web.yml -- include: /srv/web/infra/ansible/playbooks/include/proxies-reverseproxy.yml -- include: /srv/web/infra/ansible/playbooks/include/proxies-rewrites.yml -- include: /srv/web/infra/ansible/playbooks/include/proxies-redirects.yml -- include: /srv/web/infra/ansible/playbooks/include/proxies-haproxy.yml -- include: /srv/web/infra/ansible/playbooks/include/proxies-miscellaneous.yml +- include_playbook: /srv/web/infra/ansible/playbooks/include/proxies-certificates.yml +- include_playbook: /srv/web/infra/ansible/playbooks/include/proxies-websites.yml +- include_playbook: /srv/web/infra/ansible/playbooks/include/proxies-fedorahosted.yml +- include_playbook: /srv/web/infra/ansible/playbooks/include/proxies-fedora-web.yml +- include_playbook: /srv/web/infra/ansible/playbooks/include/proxies-reverseproxy.yml +- include_playbook: /srv/web/infra/ansible/playbooks/include/proxies-rewrites.yml +- include_playbook: /srv/web/infra/ansible/playbooks/include/proxies-redirects.yml +- include_playbook: /srv/web/infra/ansible/playbooks/include/proxies-haproxy.yml +- include_playbook: /srv/web/infra/ansible/playbooks/include/proxies-miscellaneous.yml - name: Make sure we are deployed fully hosts: proxies-stg:proxies @@ -190,7 +190,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" pre_tasks: # diff --git a/playbooks/groups/qa.yml b/playbooks/groups/qa.yml index f76ef82ef6..951c68486b 100644 --- a/playbooks/groups/qa.yml +++ b/playbooks/groups/qa.yml @@ -3,7 +3,7 @@ # NOTE: make sure there is room/space for this server on the vmhost # NOTE: most of these vars_path come from group_vars/mirrorlist or from hostvars -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=qa-prod:qa-stg" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=qa-prod:qa-stg" - name: make the box be real hosts: qa-prod:qa-stg @@ -28,15 +28,15 @@ - apache pre_tasks: - - include: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" tasks: # this is how you include other task lists - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: configure phabricator hosts: qa-prod:qa-stg @@ -54,7 +54,7 @@ - { role: phabricator, tags: ['phabricator'] } handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: configure qa buildbot CI @@ -74,7 +74,7 @@ - { role: taskotron/buildslave-configure, tags: ['buildslaveconfig'] } handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: configure static sites for qa-stg hosts: qa-prod:qa-stg @@ -114,6 +114,6 @@ # when: deployment_type != "qa-stg", tags: ['imagefactoryclient'] } # handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/releng-compose.yml b/playbooks/groups/releng-compose.yml index 391751103d..ef5a0d331e 100644 --- a/playbooks/groups/releng-compose.yml +++ b/playbooks/groups/releng-compose.yml @@ -3,7 +3,7 @@ # NOTE: make sure there is room/space for this instance on the buildvmhost # NOTE: most of these vars_path come from group_vars/releng or from hostvars -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=releng-compose:releng-stg:compose-ppc64-01.ppc.fedoraproject.org:compose-ppc64le-01.ppc.fedoraproject.org:compose-s390-01.s390.fedoraproject.org" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=releng-compose:releng-stg:compose-ppc64-01.ppc.fedoraproject.org:compose-ppc64le-01.ppc.fedoraproject.org:compose-s390-01.s390.fedoraproject.org" - name: Setup releng compose hosts hosts: releng-compose:releng-secondary:releng-stg @@ -18,7 +18,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" roles: - base @@ -71,8 +71,8 @@ tasks: # this is how you include other task lists - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" - name: install skopeo for container management package: @@ -81,4 +81,4 @@ when: ansible_architecture != "ppc64" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/resultsdb-dev.yml b/playbooks/groups/resultsdb-dev.yml index c021506d54..51f39a5ff3 100644 --- a/playbooks/groups/resultsdb-dev.yml +++ b/playbooks/groups/resultsdb-dev.yml @@ -3,7 +3,7 @@ # NOTE: make sure there is room/space for this server on the vmhost # NOTE: most of these vars_path come from group_vars/mirrorlist or from hostvars -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=resultsdb-dev" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=resultsdb-dev" - name: make the box be real hosts: resultsdb-dev @@ -28,12 +28,12 @@ tasks: # this is how you include other task lists - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: configure resultsdb and execdb hosts: resultsdb-dev @@ -51,5 +51,5 @@ - { role: taskotron/execdb, tags: ['execdb'] } handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/resultsdb-prod.yml b/playbooks/groups/resultsdb-prod.yml index 44a40a4e89..1539f1fa77 100644 --- a/playbooks/groups/resultsdb-prod.yml +++ b/playbooks/groups/resultsdb-prod.yml @@ -3,7 +3,7 @@ # NOTE: make sure there is room/space for this server on the vmhost # NOTE: most of these vars_path come from group_vars/mirrorlist or from hostvars -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=resultsdb-prod" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=resultsdb-prod" - name: make the box be real hosts: resultsdb-prod @@ -29,12 +29,12 @@ tasks: # this is how you include other task lists - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: configure resultsdb production hosts: resultsdb-prod @@ -53,7 +53,7 @@ - { role: taskotron/execdb, tags: ['execdb'] } handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: Install rdbsync hosts: resultsdb-prod @@ -61,7 +61,7 @@ gather_facts: True handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/resultsdb-stg.yml b/playbooks/groups/resultsdb-stg.yml index ee168c4e2c..40429fac76 100644 --- a/playbooks/groups/resultsdb-stg.yml +++ b/playbooks/groups/resultsdb-stg.yml @@ -3,7 +3,7 @@ # NOTE: make sure there is room/space for this server on the vmhost # NOTE: most of these vars_path come from group_vars/mirrorlist or from hostvars -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=resultsdb-stg" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=resultsdb-stg" - name: make the box be real hosts: resultsdb-stg @@ -28,12 +28,12 @@ tasks: # this is how you include other task lists - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: configure resultsdb hosts: resultsdb-stg @@ -52,7 +52,7 @@ - { role: taskotron/execdb, tags: ['execdb'] } handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: Install rdbsync hosts: resultsdb-stg @@ -60,7 +60,7 @@ gather_facts: True handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/retrace.yml b/playbooks/groups/retrace.yml index 9ef7b6a6d3..022a3f34d6 100644 --- a/playbooks/groups/retrace.yml +++ b/playbooks/groups/retrace.yml @@ -1,4 +1,4 @@ -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=faf-stg:retrace-stg" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=faf-stg:retrace-stg" - name: Setup retrace hosts hosts: retrace:faf-stg:retrace-stg @@ -20,12 +20,12 @@ - fedmsg/base tasks: - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: setup FAF server hosts: retrace:faf-stg diff --git a/playbooks/groups/secondary.yml b/playbooks/groups/secondary.yml index 7ccddbc634..6728e3c1b5 100644 --- a/playbooks/groups/secondary.yml +++ b/playbooks/groups/secondary.yml @@ -1,4 +1,4 @@ -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=secondary" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=secondary" - name: setup secondary arch download server hosts: secondary @@ -47,9 +47,9 @@ - archive.fedoraproject.org - archives.fedoraproject.org tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" - name: Install some misc packages needed for various tasks package: name={{ item }} state=present @@ -71,4 +71,4 @@ cron_file=update-fullfiletimelist handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/sign-bridge.yml b/playbooks/groups/sign-bridge.yml index 9a1d49be4d..a7981b4ca2 100644 --- a/playbooks/groups/sign-bridge.yml +++ b/playbooks/groups/sign-bridge.yml @@ -6,7 +6,7 @@ # Access is via management interface only. This playbook does initial setup. # Please check with rel-eng before doing anything here. -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=sign-bridge" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=sign-bridge" - name: configure sign bridge server hosts: sign-bridge @@ -32,9 +32,9 @@ owner_group: sigul tasks: - - include: "{{ tasks_path }}/motd.yml" - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/smtp-mm.yml b/playbooks/groups/smtp-mm.yml index d93e46f816..b782fe0ba6 100644 --- a/playbooks/groups/smtp-mm.yml +++ b/playbooks/groups/smtp-mm.yml @@ -1,6 +1,6 @@ # create smtp servers -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=smtp-mm" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=smtp-mm" - name: make the box be real hosts: smtp-mm @@ -24,9 +24,9 @@ when: env != "staging" } tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/statscache.yml b/playbooks/groups/statscache.yml index f1fb38f0b2..2205cdac43 100644 --- a/playbooks/groups/statscache.yml +++ b/playbooks/groups/statscache.yml @@ -3,7 +3,7 @@ # NOTE: make sure there is room/space for this server on the vmhost # NOTE: most of these vars_path come from group_vars/notifs-web* or from hostvars -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=statscache:statscache-stg" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=statscache:statscache-stg" - name: make the box be real hosts: statscache:statscache-stg @@ -14,7 +14,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" roles: - base @@ -27,9 +27,9 @@ - sudo tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" - name: Stuff just for the web frontend hosts: statscache-web:statscache-web-stg @@ -40,7 +40,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" roles: - mod_wsgi @@ -57,7 +57,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" roles: - fedmsg/hub diff --git a/playbooks/groups/summershum.yml b/playbooks/groups/summershum.yml index 81f70ad0c0..4313c7d3b4 100644 --- a/playbooks/groups/summershum.yml +++ b/playbooks/groups/summershum.yml @@ -3,7 +3,7 @@ # NOTE: make sure there is room/space for this server on the vmhost # NOTE: most of these vars_path come from group_vars/mirrorlist or from hostvars -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=summershum:summershum-stg" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=summershum:summershum-stg" - name: dole out the generic configuration hosts: summershum:summershum-stg @@ -29,12 +29,12 @@ # when: env != "staging" } tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: set up fedmsg basics hosts: summershum:summershum-stg @@ -50,7 +50,7 @@ - fedmsg/base handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: dole out the service-specific config hosts: summershum:summershum-stg @@ -69,4 +69,4 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/sundries.yml b/playbooks/groups/sundries.yml index ebbca5ceca..bb1a981a70 100644 --- a/playbooks/groups/sundries.yml +++ b/playbooks/groups/sundries.yml @@ -3,7 +3,7 @@ # These servers run a number of smaller apps that don't merit their own instances. # -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=sundries:sundries-stg" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=sundries:sundries-stg" - name: make the box be real hosts: sundries:sundries-stg @@ -55,11 +55,11 @@ when: master_sundries_node tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" - - include: "{{ tasks_path }}/reg-server.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/reg-server.yml" when: master_sundries_node and env == "staging" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/tagger.yml b/playbooks/groups/tagger.yml index 7734daa9fa..6ebc4a7248 100644 --- a/playbooks/groups/tagger.yml +++ b/playbooks/groups/tagger.yml @@ -3,7 +3,7 @@ # NOTE: make sure there is room/space for this server on the vmhost # NOTE: most of these vars_path come from group_vars/tagger* or from hostvars -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=tagger:tagger-stg" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=tagger:tagger-stg" - name: make the box be real hosts: tagger:tagger-stg @@ -29,12 +29,12 @@ - mod_wsgi tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: dole out the service specific config hosts: tagger:tagger-stg @@ -50,7 +50,7 @@ - tagger handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" # This comes last because it relies on a group created by the tagger role. - name: setup fedmsg @@ -67,4 +67,4 @@ - fedmsg/base handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/taskotron-client-hosts.yml b/playbooks/groups/taskotron-client-hosts.yml index a39c5ebec2..84bbdb0f85 100644 --- a/playbooks/groups/taskotron-client-hosts.yml +++ b/playbooks/groups/taskotron-client-hosts.yml @@ -15,7 +15,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" roles: - base @@ -28,11 +28,11 @@ - { role: openvpn/client, when: datacenter != "phx2" } tasks: - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: configure taskotron imagefactory hosts: qa11.qa.fedoraproject.org:qa12.qa.fedoraproject.org @@ -48,7 +48,7 @@ - { role: taskotron/imagefactory, tags: ['taskotronimagefactory'] } handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: configure taskotron client host hosts: taskotron-dev-client-hosts:taskotron-stg-client-hosts:taskotron-prod-client-hosts @@ -67,6 +67,6 @@ - { role: taskotron/buildslave-configure, tags: ['buildslaveconfigure'] } handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/taskotron.yml b/playbooks/groups/taskotron.yml index e2226d7a4a..f35374faee 100644 --- a/playbooks/groups/taskotron.yml +++ b/playbooks/groups/taskotron.yml @@ -3,7 +3,7 @@ # NOTE: make sure there is room/space for this server on the vmhost # NOTE: most of these vars_path come from group_vars/mirrorlist or from hostvars -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=taskotron-dev:taskotron-stg:taskotron-prod" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=taskotron-dev:taskotron-stg:taskotron-prod" - name: make the box be real hosts: taskotron-dev:taskotron-stg:taskotron-prod @@ -31,12 +31,12 @@ tasks: # this is how you include other task lists - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: configure taskotron master hosts: taskotron-dev:taskotron-stg:taskotron-prod @@ -61,7 +61,7 @@ - { role: taskotron/taskotron-master, tags: ['taskotronmaster'] } handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: configure standalone taskotron host hosts: taskotron-dev @@ -78,4 +78,4 @@ - { role: taskotron/ssl-taskotron, tags: ['ssltaskotron'] } handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/torrent.yml b/playbooks/groups/torrent.yml index b196ca95ac..6e5f4306c2 100644 --- a/playbooks/groups/torrent.yml +++ b/playbooks/groups/torrent.yml @@ -1,4 +1,4 @@ -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=torrent" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=torrent" - name: make the box be real hosts: torrent @@ -35,9 +35,9 @@ sslonly: true tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/transitional-datanommer.yml b/playbooks/groups/transitional-datanommer.yml index 16baec5ca1..36d05197e6 100644 --- a/playbooks/groups/transitional-datanommer.yml +++ b/playbooks/groups/transitional-datanommer.yml @@ -1,4 +1,4 @@ -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=transitional-datanommer" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=transitional-datanommer" - name: dole out the generic configuration hosts: transitional-datanommer @@ -22,12 +22,12 @@ - openvpn/client tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: dole out the service-specific config hosts: transitional-datanommer @@ -47,4 +47,4 @@ - "{{ vars_path }}/{{ ansible_distribution }}.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/twisted-buildbots.yml b/playbooks/groups/twisted-buildbots.yml index 6610920c83..195af2ee8a 100644 --- a/playbooks/groups/twisted-buildbots.yml +++ b/playbooks/groups/twisted-buildbots.yml @@ -9,7 +9,7 @@ - /srv/private/ansible/files/openstack/passwords.yml tasks: - - include: "{{ tasks_path }}/persistent_cloud.yml" + - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" - name: setup all the things hosts: twisted-buildbots @@ -21,7 +21,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks_path }}/cloud_setup_basic.yml" + - include_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" diff --git a/playbooks/groups/unbound.yml b/playbooks/groups/unbound.yml index a3e3e02778..dc46d444ba 100644 --- a/playbooks/groups/unbound.yml +++ b/playbooks/groups/unbound.yml @@ -1,4 +1,4 @@ -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=unbound" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=unbound" - name: make the box be real hosts: unbound @@ -23,9 +23,9 @@ when: env != "staging" } tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/value.yml b/playbooks/groups/value.yml index e907c43936..58949368e3 100644 --- a/playbooks/groups/value.yml +++ b/playbooks/groups/value.yml @@ -1,4 +1,4 @@ -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=value:value-stg" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=value:value-stg" - name: make the box be real hosts: value:value-stg @@ -30,9 +30,9 @@ - mote tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/virthost.yml b/playbooks/groups/virthost.yml index 1c90a5847f..8df3910490 100644 --- a/playbooks/groups/virthost.yml +++ b/playbooks/groups/virthost.yml @@ -13,7 +13,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" roles: - base @@ -28,8 +28,8 @@ - virthost tasks: - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/wiki.yml b/playbooks/groups/wiki.yml index 07c32717ec..ed92236130 100644 --- a/playbooks/groups/wiki.yml +++ b/playbooks/groups/wiki.yml @@ -3,7 +3,7 @@ # These servers run mediawiki for the main fedora wiki instance. # -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=wiki:wiki-stg" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=wiki:wiki-stg" - name: make the box be real hosts: wiki:wiki-stg @@ -16,7 +16,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" roles: - base @@ -36,8 +36,8 @@ when: env != "staging" } tasks: - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/zanata2fedmsg.yml b/playbooks/groups/zanata2fedmsg.yml index 687d77c015..7ec8e58956 100644 --- a/playbooks/groups/zanata2fedmsg.yml +++ b/playbooks/groups/zanata2fedmsg.yml @@ -3,7 +3,7 @@ # NOTE: make sure there is room/space for this server on the vmhost # NOTE: most of these vars_path come from group_vars/zanata2fedmsg* or from hostvars -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=zanata2fedmsg:zanata2fedmsg-stg" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=zanata2fedmsg:zanata2fedmsg-stg" - name: make the box be real hosts: zanata2fedmsg:zanata2fedmsg-stg @@ -29,12 +29,12 @@ - mod_wsgi tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: deploy service-specific config hosts: zanata2fedmsg:zanata2fedmsg-stg @@ -47,7 +47,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" roles: - zanata2fedmsg diff --git a/playbooks/hosts/ansiblemagazine.fedorainfracloud.org.yml b/playbooks/hosts/ansiblemagazine.fedorainfracloud.org.yml index a066d67883..2b556ecc28 100644 --- a/playbooks/hosts/ansiblemagazine.fedorainfracloud.org.yml +++ b/playbooks/hosts/ansiblemagazine.fedorainfracloud.org.yml @@ -9,10 +9,10 @@ - /srv/private/ansible/files/openstack/passwords.yml tasks: - - include: "{{ tasks_path }}/persistent_cloud.yml" + - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: setup all the things hosts: ansiblemagazine.fedorainfracloud.org @@ -24,7 +24,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks_path }}/cloud_setup_basic.yml" + - include_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" diff --git a/playbooks/hosts/artboard.fedorainfracloud.org.yml b/playbooks/hosts/artboard.fedorainfracloud.org.yml index 7e3d283eae..75ccc685e4 100644 --- a/playbooks/hosts/artboard.fedorainfracloud.org.yml +++ b/playbooks/hosts/artboard.fedorainfracloud.org.yml @@ -9,10 +9,10 @@ - /srv/private/ansible/files/openstack/passwords.yml tasks: - - include: "{{ tasks_path }}/persistent_cloud.yml" + - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: setup all the things hosts: artboard.fedorainfracloud.org @@ -24,7 +24,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks_path }}/cloud_setup_basic.yml" + - include_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" @@ -125,4 +125,4 @@ - artboard handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/hosts/blockerbugs-dev.cloud.fedoraproject.org.yml b/playbooks/hosts/blockerbugs-dev.cloud.fedoraproject.org.yml index 32635ffe82..207c504473 100644 --- a/playbooks/hosts/blockerbugs-dev.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/blockerbugs-dev.cloud.fedoraproject.org.yml @@ -8,11 +8,11 @@ - "/srv/private/ansible/vars.yml" tasks: - - include: "{{ tasks_path }}/persistent_cloud.yml" - - include: "{{ tasks_path }}/growroot_cloud.yml" + - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" + - include_tasks: "{{ tasks_path }}/growroot_cloud.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: provision instance hosts: blockerbugs-dev.cloud.fedoraproject.org @@ -31,9 +31,9 @@ - basessh tasks: - - include: "{{ tasks_path }}/cloud_setup_basic.yml" + - include_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" - name: mount up blockerbugs-dev to /srv/persistent mount: name=/srv/persistent src='LABEL=blockerbugs-dev' fstype=ext4 state=mounted handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/hosts/cloud-noc01.cloud.fedoraproject.org.yml b/playbooks/hosts/cloud-noc01.cloud.fedoraproject.org.yml index 49e9070ddd..f25894e4b4 100644 --- a/playbooks/hosts/cloud-noc01.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/cloud-noc01.cloud.fedoraproject.org.yml @@ -22,10 +22,10 @@ - tftp_server tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/hosts/commops.fedorainfracloud.org.yml b/playbooks/hosts/commops.fedorainfracloud.org.yml index 36326f4271..78e841c622 100644 --- a/playbooks/hosts/commops.fedorainfracloud.org.yml +++ b/playbooks/hosts/commops.fedorainfracloud.org.yml @@ -9,10 +9,10 @@ - /srv/private/ansible/files/openstack/passwords.yml tasks: - - include: "{{ tasks_path }}/persistent_cloud.yml" + - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: setup all the things hosts: commops.fedorainfracloud.org @@ -24,7 +24,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks_path }}/cloud_setup_basic.yml" + - include_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" diff --git a/playbooks/hosts/communityblog.fedorainfracloud.org.yml b/playbooks/hosts/communityblog.fedorainfracloud.org.yml index 437484492b..58e63fa01a 100644 --- a/playbooks/hosts/communityblog.fedorainfracloud.org.yml +++ b/playbooks/hosts/communityblog.fedorainfracloud.org.yml @@ -9,10 +9,10 @@ - /srv/private/ansible/files/openstack/passwords.yml tasks: - - include: "{{ tasks_path }}/persistent_cloud.yml" + - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: setup all the things hosts: communityblog.fedorainfracloud.org @@ -24,7 +24,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks_path }}/cloud_setup_basic.yml" + - include_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" diff --git a/playbooks/hosts/darkserver-dev.fedorainfracloud.org.yml b/playbooks/hosts/darkserver-dev.fedorainfracloud.org.yml index cf038777a0..2e7e5f09f3 100644 --- a/playbooks/hosts/darkserver-dev.fedorainfracloud.org.yml +++ b/playbooks/hosts/darkserver-dev.fedorainfracloud.org.yml @@ -9,11 +9,11 @@ - /srv/private/ansible/files/openstack/passwords.yml tasks: - - include: "{{ tasks_path }}/persistent_cloud.yml" - - include: "{{ tasks_path }}/growroot_cloud_el7.yml" + - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" + - include_tasks: "{{ tasks_path }}/growroot_cloud_el7.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: setup all the things hosts: darkserver-dev.fedorainfracloud.org @@ -25,7 +25,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks_path }}/cloud_setup_basic.yml" + - include_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" diff --git a/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml b/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml index 5d2e879abd..65639091af 100644 --- a/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml +++ b/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml @@ -11,7 +11,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" roles: - base @@ -31,11 +31,11 @@ - web-data-analysis tasks: - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: dole out the service-specific config hosts: data-analysis01.phx2.fedoraproject.org @@ -46,7 +46,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" roles: - role: nfs/client diff --git a/playbooks/hosts/developer.fedorainfracloud.org.yml b/playbooks/hosts/developer.fedorainfracloud.org.yml index 38b02f09fa..e174271ad7 100644 --- a/playbooks/hosts/developer.fedorainfracloud.org.yml +++ b/playbooks/hosts/developer.fedorainfracloud.org.yml @@ -9,10 +9,10 @@ - /srv/private/ansible/files/openstack/passwords.yml tasks: - - include: "{{ tasks_path }}/persistent_cloud.yml" + - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: setup all the things hosts: developer.fedorainfracloud.org @@ -24,7 +24,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - - include: "{{ tasks_path }}/cloud_setup_basic.yml" + - include_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" diff --git a/playbooks/hosts/eclipse.fedorainfracloud.org.yml b/playbooks/hosts/eclipse.fedorainfracloud.org.yml index 760679fdd7..cee393cbc4 100644 --- a/playbooks/hosts/eclipse.fedorainfracloud.org.yml +++ b/playbooks/hosts/eclipse.fedorainfracloud.org.yml @@ -9,10 +9,10 @@ - /srv/private/ansible/files/openstack/passwords.yml tasks: - - include: "{{ tasks_path }}/persistent_cloud.yml" + - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: setup all the things hosts: eclipse.fedorainfracloud.org @@ -24,12 +24,12 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" roles: - basessh tasks: - - include: "{{ tasks_path }}/cloud_setup_basic.yml" + - include_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" diff --git a/playbooks/hosts/faitout.fedorainfracloud.org.yml b/playbooks/hosts/faitout.fedorainfracloud.org.yml index abd6f7a6b3..fc95666d3c 100644 --- a/playbooks/hosts/faitout.fedorainfracloud.org.yml +++ b/playbooks/hosts/faitout.fedorainfracloud.org.yml @@ -9,10 +9,10 @@ - /srv/private/ansible/files/openstack/passwords.yml tasks: - - include: "{{ tasks_path }}/persistent_cloud.yml" + - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: setup all the things hosts: faitout.fedorainfracloud.org @@ -24,7 +24,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks_path }}/cloud_setup_basic.yml" + - include_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" diff --git a/playbooks/hosts/fas2-dev.fedorainfracloud.org.yml b/playbooks/hosts/fas2-dev.fedorainfracloud.org.yml index 47a1fbdee1..26da31971e 100644 --- a/playbooks/hosts/fas2-dev.fedorainfracloud.org.yml +++ b/playbooks/hosts/fas2-dev.fedorainfracloud.org.yml @@ -9,10 +9,10 @@ - /srv/private/ansible/files/openstack/passwords.yml tasks: - - include: "{{ tasks_path }}/persistent_cloud.yml" + - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: setup all the things hosts: fas2-dev.fedorainfracloud.org @@ -24,7 +24,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks_path }}/cloud_setup_basic.yml" + - include_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" diff --git a/playbooks/hosts/fas3-dev.fedorainfracloud.org.yml b/playbooks/hosts/fas3-dev.fedorainfracloud.org.yml index 7d119084d0..8dc50bf6fa 100644 --- a/playbooks/hosts/fas3-dev.fedorainfracloud.org.yml +++ b/playbooks/hosts/fas3-dev.fedorainfracloud.org.yml @@ -9,10 +9,10 @@ - /srv/private/ansible/files/openstack/passwords.yml tasks: - - include: "{{ tasks_path }}/persistent_cloud.yml" + - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: setup all the things hosts: fas3-dev.fedorainfracloud.org @@ -24,7 +24,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks_path }}/cloud_setup_basic.yml" + - include_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" diff --git a/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml b/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml index 7b665d720d..8fc869d0b9 100644 --- a/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml @@ -41,14 +41,14 @@ - sudo handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - - include: "{{ tasks_path }}/cloud_setup_basic.yml" + - include_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" vars: root_auth_users: msuchy - - include: "{{ tasks_path }}/motd.yml" - - include: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" - name: set root passwd user: name=root password={{ cloud_rootpw }} state=present diff --git a/playbooks/hosts/fedimg-dev.fedorainfracloud.org.yml b/playbooks/hosts/fedimg-dev.fedorainfracloud.org.yml index 235cdd819c..92958a526f 100644 --- a/playbooks/hosts/fedimg-dev.fedorainfracloud.org.yml +++ b/playbooks/hosts/fedimg-dev.fedorainfracloud.org.yml @@ -9,10 +9,10 @@ - /srv/private/ansible/files/openstack/passwords.yml tasks: - - include: "{{ tasks_path }}/persistent_cloud.yml" + - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: setup all the things hosts: fedimg-dev.fedorainfracloud.org @@ -24,14 +24,14 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" pre_tasks: - - include: "{{ tasks_path }}/cloud_setup_basic.yml" + - include_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" diff --git a/playbooks/hosts/fedora-bootstrap.fedorainfracloud.org.yml b/playbooks/hosts/fedora-bootstrap.fedorainfracloud.org.yml index 69147719bb..d187db388d 100644 --- a/playbooks/hosts/fedora-bootstrap.fedorainfracloud.org.yml +++ b/playbooks/hosts/fedora-bootstrap.fedorainfracloud.org.yml @@ -9,10 +9,10 @@ - /srv/private/ansible/files/openstack/passwords.yml tasks: - - include: "{{ tasks_path }}/persistent_cloud.yml" + - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: setup all the things hosts: fedora-bootstrap.fedorainfracloud.org @@ -24,7 +24,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks_path }}/cloud_setup_basic.yml" + - include_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" diff --git a/playbooks/hosts/glittergallery-dev.fedorainfracloud.org.yml b/playbooks/hosts/glittergallery-dev.fedorainfracloud.org.yml index 97a96cbd57..ba4533d26a 100644 --- a/playbooks/hosts/glittergallery-dev.fedorainfracloud.org.yml +++ b/playbooks/hosts/glittergallery-dev.fedorainfracloud.org.yml @@ -9,10 +9,10 @@ - /srv/private/ansible/files/openstack/passwords.yml tasks: - - include: "{{ tasks_path }}/persistent_cloud.yml" + - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: setup all the things hosts: glittergallery-dev.fedorainfracloud.org @@ -24,7 +24,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks_path }}/cloud_setup_basic.yml" + - include_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" diff --git a/playbooks/hosts/grafana.cloud.fedoraproject.org.yml b/playbooks/hosts/grafana.cloud.fedoraproject.org.yml index 44fed03e0b..4932b1e5e1 100644 --- a/playbooks/hosts/grafana.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/grafana.cloud.fedoraproject.org.yml @@ -9,10 +9,10 @@ - /srv/private/ansible/files/openstack/passwords.yml tasks: - - include: "{{ tasks_path }}/persistent_cloud.yml" + - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: setup all the things hosts: grafana.cloud.fedoraproject.org @@ -33,14 +33,14 @@ - graphite/grafana tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - #- include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + #- include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" pre_tasks: - - include: "{{ tasks_path }}/cloud_setup_basic.yml" + - include_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" diff --git a/playbooks/hosts/graphite.fedorainfracloud.org.yml b/playbooks/hosts/graphite.fedorainfracloud.org.yml index 8348108d4e..c979c92932 100644 --- a/playbooks/hosts/graphite.fedorainfracloud.org.yml +++ b/playbooks/hosts/graphite.fedorainfracloud.org.yml @@ -9,10 +9,10 @@ - /srv/private/ansible/files/openstack/passwords.yml tasks: - - include: "{{ tasks_path }}/persistent_cloud.yml" + - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: setup all the things hosts: graphite.fedorainfracloud.org @@ -33,14 +33,14 @@ - graphite/fedmsg2statsd tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - #- include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + #- include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" pre_tasks: - - include: "{{ tasks_path }}/cloud_setup_basic.yml" + - include_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" diff --git a/playbooks/hosts/hubs-dev.fedorainfracloud.org.yml b/playbooks/hosts/hubs-dev.fedorainfracloud.org.yml index 00a322ba2f..b6e194f84c 100644 --- a/playbooks/hosts/hubs-dev.fedorainfracloud.org.yml +++ b/playbooks/hosts/hubs-dev.fedorainfracloud.org.yml @@ -9,10 +9,10 @@ - /srv/private/ansible/files/openstack/passwords.yml tasks: - - include: "{{ tasks_path }}/persistent_cloud.yml" + - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: setup all the things @@ -26,12 +26,12 @@ pre_tasks: - - include: "{{ tasks_path }}/cloud_setup_basic.yml" + - include_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" - - include: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" - dnf: name={{item}} state=present with_items: diff --git a/playbooks/hosts/iddev.fedorainfracloud.org.yml b/playbooks/hosts/iddev.fedorainfracloud.org.yml index 3a6e602c16..d1f92af6ce 100644 --- a/playbooks/hosts/iddev.fedorainfracloud.org.yml +++ b/playbooks/hosts/iddev.fedorainfracloud.org.yml @@ -9,10 +9,10 @@ - /srv/private/ansible/files/openstack/passwords.yml tasks: - - include: "{{ tasks_path }}/persistent_cloud.yml" + - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: setup all the things hosts: iddev.fedorainfracloud.org @@ -31,12 +31,12 @@ - base pre_tasks: - - include: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" tasks: - - include: "{{ tasks_path }}/cloud_setup_basic.yml" + - include_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/hosts/insim.fedorainfracloud.org.yml b/playbooks/hosts/insim.fedorainfracloud.org.yml index f4d9cd9f02..0adc9bd107 100644 --- a/playbooks/hosts/insim.fedorainfracloud.org.yml +++ b/playbooks/hosts/insim.fedorainfracloud.org.yml @@ -10,10 +10,10 @@ - /srv/private/ansible/files/openstack/passwords.yml tasks: - - include: "{{ tasks_path }}/persistent_cloud.yml" + - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: setup all the things hosts: insim.fedorainfracloud.org @@ -25,7 +25,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks_path }}/cloud_setup_basic.yml" + - include_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" diff --git a/playbooks/hosts/java-deptools.fedorainfracloud.org b/playbooks/hosts/java-deptools.fedorainfracloud.org index 9b22b424a1..ad7fe292a2 100644 --- a/playbooks/hosts/java-deptools.fedorainfracloud.org +++ b/playbooks/hosts/java-deptools.fedorainfracloud.org @@ -9,10 +9,10 @@ - /srv/private/ansible/files/openstack/passwords.yml tasks: - - include: "{{ tasks_path }}/persistent_cloud.yml" + - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: setup all the things hosts: java-deptools.fedorainfracloud.org @@ -24,7 +24,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks_path }}/cloud_setup_basic.yml" + - include_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) shell: "hostname {{inventory_hostname}}" diff --git a/playbooks/hosts/lists-dev.fedorainfracloud.org.yml b/playbooks/hosts/lists-dev.fedorainfracloud.org.yml index 8962f1c69b..ebdc0f1f2d 100644 --- a/playbooks/hosts/lists-dev.fedorainfracloud.org.yml +++ b/playbooks/hosts/lists-dev.fedorainfracloud.org.yml @@ -9,10 +9,10 @@ - /srv/private/ansible/files/openstack/passwords.yml tasks: - - include: "{{ tasks_path }}/persistent_cloud.yml" + - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: setup all the things hosts: lists-dev.fedorainfracloud.org @@ -28,7 +28,7 @@ - postfix_maincf: "{{ roles_path }}/base/files/postfix/main.cf/main.cf.{{ inventory_hostname }}" pre_tasks: - - include: "{{ tasks_path }}/cloud_setup_basic.yml" + - include_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" @@ -40,9 +40,9 @@ - base tasks: - - include: "{{ tasks_path }}/postfix_basic.yml" - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/postfix_basic.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" # Basic Apache config - name: install mod_ssl @@ -86,7 +86,7 @@ owner=root group=root mode=0440 handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: restart postgresql service: name=postgresql state=restarted @@ -171,6 +171,6 @@ handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: reload aliases command: newaliases diff --git a/playbooks/hosts/magazine2.fedorainfracloud.org.yml b/playbooks/hosts/magazine2.fedorainfracloud.org.yml index d2736d3814..ec84f8cff0 100644 --- a/playbooks/hosts/magazine2.fedorainfracloud.org.yml +++ b/playbooks/hosts/magazine2.fedorainfracloud.org.yml @@ -9,10 +9,10 @@ - /srv/private/ansible/files/openstack/passwords.yml tasks: - - include: "{{ tasks_path }}/persistent_cloud.yml" + - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: setup all the things hosts: magazine2.fedorainfracloud.org @@ -24,7 +24,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks_path }}/cloud_setup_basic.yml" + - include_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" diff --git a/playbooks/hosts/modernpaste.fedorainfracloud.org.yml b/playbooks/hosts/modernpaste.fedorainfracloud.org.yml index 0c1abb1040..75314c234b 100644 --- a/playbooks/hosts/modernpaste.fedorainfracloud.org.yml +++ b/playbooks/hosts/modernpaste.fedorainfracloud.org.yml @@ -9,10 +9,10 @@ - /srv/private/ansible/files/openstack/passwords.yml tasks: - - include: "{{ tasks_path }}/persistent_cloud.yml" + - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: setup all the things hosts: modernpaste.fedorainfracloud.org @@ -31,9 +31,9 @@ - base pre_tasks: - - include: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" tasks: - - include: "{{ tasks_path }}/cloud_setup_basic.yml" + - include_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" diff --git a/playbooks/hosts/modularity.fedorainfracloud.org.yml b/playbooks/hosts/modularity.fedorainfracloud.org.yml index 586dc6e3dc..9caa33c0c4 100644 --- a/playbooks/hosts/modularity.fedorainfracloud.org.yml +++ b/playbooks/hosts/modularity.fedorainfracloud.org.yml @@ -9,10 +9,10 @@ - /srv/private/ansible/files/openstack/passwords.yml tasks: - - include: "{{ tasks_path }}/persistent_cloud.yml" + - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: setup all the things hosts: modularity.fedorainfracloud.org:modularity2.fedorainfracloud.org @@ -24,7 +24,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks_path }}/cloud_setup_basic.yml" + - include_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" diff --git a/playbooks/hosts/piwik.fedorainfracloud.org.yml b/playbooks/hosts/piwik.fedorainfracloud.org.yml index 78922c0ee5..bf2b939887 100644 --- a/playbooks/hosts/piwik.fedorainfracloud.org.yml +++ b/playbooks/hosts/piwik.fedorainfracloud.org.yml @@ -9,10 +9,10 @@ - /srv/private/ansible/files/openstack/passwords.yml tasks: - - include: "{{ tasks_path }}/persistent_cloud.yml" + - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: setup all the things hosts: piwik.fedorainfracloud.org @@ -24,7 +24,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" roles: - basessh @@ -36,9 +36,9 @@ - nagios_client pre_tasks: - - include: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" tasks: - - include: "{{ tasks_path }}/cloud_setup_basic.yml" + - include_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" diff --git a/playbooks/hosts/regcfp2.fedorainfracloud.org.yml b/playbooks/hosts/regcfp2.fedorainfracloud.org.yml index e8022645a8..4e0a207d6e 100644 --- a/playbooks/hosts/regcfp2.fedorainfracloud.org.yml +++ b/playbooks/hosts/regcfp2.fedorainfracloud.org.yml @@ -9,10 +9,10 @@ - /srv/private/ansible/files/openstack/passwords.yml tasks: - - include: "{{ tasks_path }}/persistent_cloud.yml" + - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: setup all the things hosts: regcfp2.fedorainfracloud.org @@ -24,7 +24,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks_path }}/cloud_setup_basic.yml" + - include_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" diff --git a/playbooks/hosts/respins.fedorainfracloud.org.yml b/playbooks/hosts/respins.fedorainfracloud.org.yml index 5d49b768eb..2d83899221 100644 --- a/playbooks/hosts/respins.fedorainfracloud.org.yml +++ b/playbooks/hosts/respins.fedorainfracloud.org.yml @@ -9,10 +9,10 @@ - /srv/private/ansible/files/openstack/passwords.yml tasks: - - include: "{{ tasks_path }}/persistent_cloud.yml" + - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: setup all the things hosts: respins.fedorainfracloud.org @@ -24,7 +24,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks_path }}/cloud_setup_basic.yml" + - include_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" diff --git a/playbooks/hosts/shogun-ca.cloud.fedoraproject.org.yml b/playbooks/hosts/shogun-ca.cloud.fedoraproject.org.yml index d86f034c87..2f86731695 100644 --- a/playbooks/hosts/shogun-ca.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/shogun-ca.cloud.fedoraproject.org.yml @@ -8,11 +8,11 @@ - "/srv/private/ansible/vars.yml" tasks: - - include: "{{ tasks_path }}/persistent_cloud.yml" - - include: "{{ tasks_path }}/growroot_cloud.yml" + - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" + - include_tasks: "{{ tasks_path }}/growroot_cloud.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: provision instance hosts: 209.132.184.157 @@ -28,8 +28,8 @@ - basessh tasks: - - include: "{{ tasks_path }}/cloud_setup_basic.yml" - - include: "{{ tasks_path }}/postfix_basic.yml" + - include_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" + - include_tasks: "{{ tasks_path }}/postfix_basic.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/hosts/shumgrepper-dev.fedorainfracloud.org.yml b/playbooks/hosts/shumgrepper-dev.fedorainfracloud.org.yml index 7d2112f82d..cd5653cbe6 100644 --- a/playbooks/hosts/shumgrepper-dev.fedorainfracloud.org.yml +++ b/playbooks/hosts/shumgrepper-dev.fedorainfracloud.org.yml @@ -9,10 +9,10 @@ - /srv/private/ansible/files/openstack/passwords.yml tasks: - - include: "{{ tasks_path }}/persistent_cloud.yml" + - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: setup all the things hosts: shumgrepper-dev.fedorainfracloud.org @@ -24,7 +24,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks_path }}/cloud_setup_basic.yml" + - include_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" diff --git a/playbooks/hosts/taiga.fedorainfracloud.org.yml b/playbooks/hosts/taiga.fedorainfracloud.org.yml index e715c085e7..511e2942b4 100644 --- a/playbooks/hosts/taiga.fedorainfracloud.org.yml +++ b/playbooks/hosts/taiga.fedorainfracloud.org.yml @@ -9,10 +9,10 @@ - /srv/private/ansible/files/openstack/passwords.yml tasks: - - include: "{{ tasks_path }}/persistent_cloud.yml" + - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: setup all the things hosts: taiga.fedorainfracloud.org @@ -23,7 +23,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks_path }}/cloud_setup_basic.yml" + - include_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" diff --git a/playbooks/hosts/taigastg.fedorainfracloud.org.yml b/playbooks/hosts/taigastg.fedorainfracloud.org.yml index 0e1da588f0..ec98912bdf 100644 --- a/playbooks/hosts/taigastg.fedorainfracloud.org.yml +++ b/playbooks/hosts/taigastg.fedorainfracloud.org.yml @@ -9,10 +9,10 @@ - /srv/private/ansible/files/openstack/passwords.yml tasks: - - include: "{{ tasks_path }}/persistent_cloud.yml" + - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: setup all the things hosts: taigastg.fedorainfracloud.org @@ -24,7 +24,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks_path }}/cloud_setup_basic.yml" + - include_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" diff --git a/playbooks/hosts/testdays.fedorainfracloud.org.yml b/playbooks/hosts/testdays.fedorainfracloud.org.yml index 8fe357a4c5..00194df6a8 100644 --- a/playbooks/hosts/testdays.fedorainfracloud.org.yml +++ b/playbooks/hosts/testdays.fedorainfracloud.org.yml @@ -10,10 +10,10 @@ - /srv/private/ansible/files/openstack/passwords.yml tasks: - - include: "{{ tasks_path }}/persistent_cloud.yml" + - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: setup all the things hosts: testdays.fedorainfracloud.org @@ -25,7 +25,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks_path }}/cloud_setup_basic.yml" + - include_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" @@ -49,5 +49,5 @@ - { role: testdays, tags: ['testdays'] } handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/hosts/upstreamfirst.fedorainfracloud.org.yml b/playbooks/hosts/upstreamfirst.fedorainfracloud.org.yml index 9803bb3e55..eac59f2e18 100644 --- a/playbooks/hosts/upstreamfirst.fedorainfracloud.org.yml +++ b/playbooks/hosts/upstreamfirst.fedorainfracloud.org.yml @@ -9,10 +9,10 @@ - /srv/private/ansible/files/openstack/passwords.yml tasks: - - include: "{{ tasks_path }}/persistent_cloud.yml" + - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: do base configuration hosts: upstreamfirst.fedorainfracloud.org @@ -36,12 +36,12 @@ - certbot tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: deploy pagure hosts: upstreamfirst.fedorainfracloud.org @@ -70,7 +70,7 @@ # - pagure/fedmsg handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" - name: deploy ufmonitor hosts: upstreamfirst.fedorainfracloud.org @@ -86,4 +86,4 @@ - { role: ufmonitor, tags: ['ufmonitor'] } handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/include/proxies-certificates.yml b/playbooks/include/proxies-certificates.yml index ebb51b85e3..1a077c7f70 100644 --- a/playbooks/include/proxies-certificates.yml +++ b/playbooks/include/proxies-certificates.yml @@ -9,7 +9,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" roles: diff --git a/playbooks/include/proxies-fedora-web.yml b/playbooks/include/proxies-fedora-web.yml index 395f1fdb68..2ddef35cd4 100644 --- a/playbooks/include/proxies-fedora-web.yml +++ b/playbooks/include/proxies-fedora-web.yml @@ -9,7 +9,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" roles: diff --git a/playbooks/include/proxies-fedorahosted.yml b/playbooks/include/proxies-fedorahosted.yml index 8b11cfb734..dbf77aacd8 100644 --- a/playbooks/include/proxies-fedorahosted.yml +++ b/playbooks/include/proxies-fedorahosted.yml @@ -9,7 +9,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" tasks: - name: install special fedorahosted-redirects.conf with fedorahosted redirects diff --git a/playbooks/include/proxies-haproxy.yml b/playbooks/include/proxies-haproxy.yml index bb1f85545d..82dda5dac3 100644 --- a/playbooks/include/proxies-haproxy.yml +++ b/playbooks/include/proxies-haproxy.yml @@ -9,7 +9,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" roles: diff --git a/playbooks/include/proxies-miscellaneous.yml b/playbooks/include/proxies-miscellaneous.yml index bbf6d56901..78ee1de6dc 100644 --- a/playbooks/include/proxies-miscellaneous.yml +++ b/playbooks/include/proxies-miscellaneous.yml @@ -9,7 +9,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" tasks: # We retired this in favor of PDC diff --git a/playbooks/include/proxies-redirects.yml b/playbooks/include/proxies-redirects.yml index e6803c0cda..a52f0bae58 100644 --- a/playbooks/include/proxies-redirects.yml +++ b/playbooks/include/proxies-redirects.yml @@ -9,7 +9,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" roles: diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml index 4f55e3bb6b..b0e077cbb2 100644 --- a/playbooks/include/proxies-reverseproxy.yml +++ b/playbooks/include/proxies-reverseproxy.yml @@ -9,7 +9,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" vars: - varnish_url: http://localhost:6081 diff --git a/playbooks/include/proxies-rewrites.yml b/playbooks/include/proxies-rewrites.yml index 3cd51b661c..b6d4e977f3 100644 --- a/playbooks/include/proxies-rewrites.yml +++ b/playbooks/include/proxies-rewrites.yml @@ -9,7 +9,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" roles: diff --git a/playbooks/include/proxies-websites.yml b/playbooks/include/proxies-websites.yml index 66f45e4f7a..4555507c00 100644 --- a/playbooks/include/proxies-websites.yml +++ b/playbooks/include/proxies-websites.yml @@ -9,7 +9,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" pre_tasks: diff --git a/playbooks/include/virt-create.yml b/playbooks/include/virt-create.yml index 824bc555ee..ba70f751aa 100644 --- a/playbooks/include/virt-create.yml +++ b/playbooks/include/virt-create.yml @@ -8,8 +8,8 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - - include: "{{ tasks_path }}/virt_instance_create.yml" + - include_tasks: "{{ tasks_path }}/virt_instance_create.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/manual/autosign.yml b/playbooks/manual/autosign.yml index dfab0dcbe4..6948e7efea 100644 --- a/playbooks/manual/autosign.yml +++ b/playbooks/manual/autosign.yml @@ -4,7 +4,7 @@ # Access is via management interface only. This playbook does initial setup. # Please check with rel-eng before doing anything here. -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=autosign-stg" +- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=autosign-stg" - name: make the box be real hosts: autosign:autosign-stg @@ -36,9 +36,9 @@ - robosignatory tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/manual/kernel-qa.yml b/playbooks/manual/kernel-qa.yml index ccfa6ba2cb..b64c6355fb 100644 --- a/playbooks/manual/kernel-qa.yml +++ b/playbooks/manual/kernel-qa.yml @@ -21,9 +21,9 @@ - hosts tasks: - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/manual/push-badges.yml b/playbooks/manual/push-badges.yml index 1536452b26..509db43455 100644 --- a/playbooks/manual/push-badges.yml +++ b/playbooks/manual/push-badges.yml @@ -42,7 +42,7 @@ command: git pull origin master chdir={{workingdir}} handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" - name: copy new badge art over to the badges web nodes hosts: badges-web:badges-web-stg @@ -58,7 +58,7 @@ - badges/frontend handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" - name: copy any new badges rules over to the badges backend and restart it hosts: badges-backend:badges-backend-stg @@ -74,4 +74,4 @@ - badges/backend handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/manual/qadevel.yml b/playbooks/manual/qadevel.yml index e8d64a2ee6..b4e7afb57f 100644 --- a/playbooks/manual/qadevel.yml +++ b/playbooks/manual/qadevel.yml @@ -14,10 +14,10 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - - include: "{{ tasks_path }}/virt_instance_create.yml" + - include_tasks: "{{ tasks_path }}/virt_instance_create.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" - name: make the box be real hosts: qadevel:qadevel-stg @@ -38,10 +38,10 @@ - sudo tasks: - - include: "{{ tasks_path }}/hosts.yml" - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/2fa_client.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/hosts.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/manual/rebuild/mote.yml b/playbooks/manual/rebuild/mote.yml index f58c0317fb..c44bcd704f 100644 --- a/playbooks/manual/rebuild/mote.yml +++ b/playbooks/manual/rebuild/mote.yml @@ -6,7 +6,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - file: dest=/var/cache/httpd/mote/cache.json state=absent diff --git a/playbooks/manual/releng-emergency-expire-old-repo.yml b/playbooks/manual/releng-emergency-expire-old-repo.yml index d465b061e9..136caf3fdd 100644 --- a/playbooks/manual/releng-emergency-expire-old-repo.yml +++ b/playbooks/manual/releng-emergency-expire-old-repo.yml @@ -35,4 +35,4 @@ command: /usr/local/bin/sync_pkl_to_mirrorlists.sh handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/manual/restart-pagure.yml b/playbooks/manual/restart-pagure.yml index 23aca8d430..34966205c7 100644 --- a/playbooks/manual/restart-pagure.yml +++ b/playbooks/manual/restart-pagure.yml @@ -6,7 +6,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" tasks: - name: ask puiterwijk if he would like to capture debug info before restarting. diff --git a/playbooks/manual/restart-pkgdb.yml b/playbooks/manual/restart-pkgdb.yml index 6f8b9a1a6a..02ab04d9f1 100644 --- a/playbooks/manual/restart-pkgdb.yml +++ b/playbooks/manual/restart-pkgdb.yml @@ -6,7 +6,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" tasks: - name: Start apache diff --git a/playbooks/manual/sign-vault.yml b/playbooks/manual/sign-vault.yml index 777e5012d6..b8fc41eadc 100644 --- a/playbooks/manual/sign-vault.yml +++ b/playbooks/manual/sign-vault.yml @@ -17,10 +17,10 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - - include: "{{ tasks_path }}/virt_instance_create.yml" + - include_tasks: "{{ tasks_path }}/virt_instance_create.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" - name: make sign vault server hosts: sign-vault @@ -39,8 +39,8 @@ - sigul/server tasks: - - include: "{{ tasks_path }}/yumrepos.yml" - - include: "{{ tasks_path }}/motd.yml" + - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/manual/staging-sync/bodhi.yml b/playbooks/manual/staging-sync/bodhi.yml index 3cb3316fc8..dfff6c3586 100644 --- a/playbooks/manual/staging-sync/bodhi.yml +++ b/playbooks/manual/staging-sync/bodhi.yml @@ -36,7 +36,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" tasks: - copy: src=/srv/web/infra/db-dumps/bodhi2.dump.xz dest=/var/tmp/bodhi2.dump.xz diff --git a/playbooks/manual/staging-sync/db-sync.yml b/playbooks/manual/staging-sync/db-sync.yml index 9b3a47bd6a..68ea3fc8d3 100644 --- a/playbooks/manual/staging-sync/db-sync.yml +++ b/playbooks/manual/staging-sync/db-sync.yml @@ -21,7 +21,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" tasks: - service: name=httpd state=stopped @@ -38,7 +38,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" tasks: - name: Dumping the production db. This might take a minute. Go out to the lobby! @@ -62,7 +62,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" tasks: # push dump to stg from batcave @@ -86,7 +86,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" tasks: - service: name=httpd state=started @@ -103,7 +103,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" tasks: - name: Remove the db dump on the prod server @@ -118,7 +118,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" tasks: - command: rm -f /var/tmp/{{ db }}.dump.xz diff --git a/playbooks/manual/staging-sync/fas.yml b/playbooks/manual/staging-sync/fas.yml index d96d29f411..be206695c8 100644 --- a/playbooks/manual/staging-sync/fas.yml +++ b/playbooks/manual/staging-sync/fas.yml @@ -10,7 +10,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" tasks: - service: name=httpd state=stopped @@ -27,7 +27,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" tasks: - name: Dumping the production db. This might take a minute. Go out to the lobby! @@ -52,7 +52,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" tasks: # @@ -79,7 +79,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" tasks: - service: name=httpd state=started @@ -96,7 +96,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" tasks: - name: Remove the db dump on the prod server @@ -111,7 +111,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" tasks: # diff --git a/playbooks/manual/staging-sync/koji.yml b/playbooks/manual/staging-sync/koji.yml index 612d4c0f0f..f5e9f66700 100644 --- a/playbooks/manual/staging-sync/koji.yml +++ b/playbooks/manual/staging-sync/koji.yml @@ -17,7 +17,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" tasks: - service: name=httpd state=stopped @@ -37,7 +37,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" tasks: - template: src=templates/koji-reset-staging.sql dest=/var/lib/pgsql/koji-reset-staging.sql @@ -68,7 +68,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" tasks: - service: name=httpd state=started diff --git a/playbooks/manual/staging-sync/koschei.yml b/playbooks/manual/staging-sync/koschei.yml index ca237c8a9d..83b1abe455 100644 --- a/playbooks/manual/staging-sync/koschei.yml +++ b/playbooks/manual/staging-sync/koschei.yml @@ -14,7 +14,7 @@ - /srv/private/ansible/vars.yml - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" tasks: - service: name={{ item }} state=stopped @@ -34,7 +34,7 @@ - /srv/private/ansible/vars.yml - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" tasks: - shell: > @@ -69,7 +69,7 @@ - /srv/private/ansible/vars.yml - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" tasks: - service: name={{ item }} state=started diff --git a/playbooks/manual/staging-sync/mailman.yml b/playbooks/manual/staging-sync/mailman.yml index 3298064606..27c364393b 100644 --- a/playbooks/manual/staging-sync/mailman.yml +++ b/playbooks/manual/staging-sync/mailman.yml @@ -10,7 +10,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" tasks: - service: name=webui-qcluster state=stopped @@ -30,7 +30,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" tasks: #- template: src=templates/mailman-reset-staging.sql dest=/var/lib/pgsql/mailman-reset-staging.sql @@ -87,7 +87,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" tasks: - command: /srv/webui/bin/prod-to-stg.py diff --git a/playbooks/manual/staging-sync/pdc.yml b/playbooks/manual/staging-sync/pdc.yml index 9a392f3bc3..54ece56895 100644 --- a/playbooks/manual/staging-sync/pdc.yml +++ b/playbooks/manual/staging-sync/pdc.yml @@ -36,7 +36,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" tasks: - copy: src=/srv/web/infra/db-dumps/pdc.dump.xz dest=/var/tmp/pdc.dump.xz diff --git a/playbooks/manual/stop_pkgdb.yml b/playbooks/manual/stop_pkgdb.yml index 7428e71b26..9d523a7a85 100644 --- a/playbooks/manual/stop_pkgdb.yml +++ b/playbooks/manual/stop_pkgdb.yml @@ -6,7 +6,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush w.r.t. apache diff --git a/playbooks/manual/update-firmware.yml b/playbooks/manual/update-firmware.yml index 3b288b4916..bf56c3d0d5 100644 --- a/playbooks/manual/update-firmware.yml +++ b/playbooks/manual/update-firmware.yml @@ -24,7 +24,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" vars: - updates: diff --git a/playbooks/manual/upgrade/anitya.yml b/playbooks/manual/upgrade/anitya.yml index 1ed2bb1630..38c5c3c564 100644 --- a/playbooks/manual/upgrade/anitya.yml +++ b/playbooks/manual/upgrade/anitya.yml @@ -6,7 +6,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" tasks: - name: clean all metadata {%if testing%}(with infrastructure-testing on){%endif%} command: yum clean all {%if testing%} --enablerepo=infrastructure-tags-stg {%endif%} @@ -26,7 +26,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush w.r.t. the frontend nagios: action=downtime minutes=15 service=host host={{ inventory_hostname_short }}{{ env_suffix }} @@ -50,7 +50,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush w.r.t. the backend nagios: action=downtime minutes=15 service=host host={{ inventory_hostname_short }}{{ env_suffix }} diff --git a/playbooks/manual/upgrade/autocloud.yml b/playbooks/manual/upgrade/autocloud.yml index 9bc58d79e7..a0d1f8b28e 100644 --- a/playbooks/manual/upgrade/autocloud.yml +++ b/playbooks/manual/upgrade/autocloud.yml @@ -8,7 +8,7 @@ vars: testing: False handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" tasks: - name: clean all metadata @@ -31,7 +31,7 @@ vars: testing: False handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" tasks: - name: dnf update tunir packages from main repo @@ -51,7 +51,7 @@ vars: testing: False handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" tasks: - name: dnf update fedfind packages from main repo @@ -71,7 +71,7 @@ vars: testing: False handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" tasks: - name: dnf update fedfind packages from main repo @@ -89,7 +89,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush w.r.t. the frontend @@ -111,7 +111,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush w.r.t. the backend @@ -154,7 +154,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" tasks: - service: name="httpd" state=started diff --git a/playbooks/manual/upgrade/badges.yml b/playbooks/manual/upgrade/badges.yml index a07f62e06d..810c442a6c 100644 --- a/playbooks/manual/upgrade/badges.yml +++ b/playbooks/manual/upgrade/badges.yml @@ -8,7 +8,7 @@ vars: testing: False handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" tasks: - name: clean all metadata {%if testing%}(with infrastructure-testing on){%endif%} @@ -37,7 +37,7 @@ vars: testing: False handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" tasks: - name: clean all metadata {%if testing%}(with infrastructure-testing on){%endif%} @@ -64,7 +64,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush w.r.t. the frontend @@ -86,7 +86,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush w.r.t. the backend @@ -124,7 +124,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" tasks: - service: name="httpd" state=started diff --git a/playbooks/manual/upgrade/bodhi.yml b/playbooks/manual/upgrade/bodhi.yml index 60d97e5f77..14782f786a 100644 --- a/playbooks/manual/upgrade/bodhi.yml +++ b/playbooks/manual/upgrade/bodhi.yml @@ -25,7 +25,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" tasks: - name: clean all metadata {%if testing%}(with infrastructure-testing on){%endif%} @@ -53,7 +53,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush w.r.t. the frontend @@ -75,7 +75,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush w.r.t. the backend @@ -113,7 +113,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" tasks: - service: name="httpd" state=started diff --git a/playbooks/manual/upgrade/bugyou.yml b/playbooks/manual/upgrade/bugyou.yml index e627a9249c..482129ee2c 100644 --- a/playbooks/manual/upgrade/bugyou.yml +++ b/playbooks/manual/upgrade/bugyou.yml @@ -8,7 +8,7 @@ vars: testing: False handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" tasks: - name: clean all metadata {%if testing%}(with infrastructure-testing on){%endif%} @@ -29,7 +29,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush w.r.t. the backend diff --git a/playbooks/manual/upgrade/bugzilla2fedmsg.yml b/playbooks/manual/upgrade/bugzilla2fedmsg.yml index 5ffb6edd9f..abea40d86b 100644 --- a/playbooks/manual/upgrade/bugzilla2fedmsg.yml +++ b/playbooks/manual/upgrade/bugzilla2fedmsg.yml @@ -8,7 +8,7 @@ vars: testing: False handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" tasks: - name: clean all metadata {%if testing%}(with infrastructure-testing on){%endif%} @@ -29,7 +29,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush diff --git a/playbooks/manual/upgrade/datagrepper.yml b/playbooks/manual/upgrade/datagrepper.yml index d15094bfbe..ffe3973bf9 100644 --- a/playbooks/manual/upgrade/datagrepper.yml +++ b/playbooks/manual/upgrade/datagrepper.yml @@ -8,7 +8,7 @@ vars: testing: False handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" tasks: - name: clean all metadata {%if testing%}(with infrastructure-testing on){%endif%} @@ -29,7 +29,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush diff --git a/playbooks/manual/upgrade/datanommer.yml b/playbooks/manual/upgrade/datanommer.yml index caaaf9e2cf..bf5751d456 100644 --- a/playbooks/manual/upgrade/datanommer.yml +++ b/playbooks/manual/upgrade/datanommer.yml @@ -16,7 +16,7 @@ vars: testing: False handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" tasks: - name: clean all metadata {%if testing%}(with infrastructure-testing on){%endif%} @@ -37,7 +37,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush nagios: action=downtime minutes=120 service=host host={{ inventory_hostname_short }}{{ env_suffix }} @@ -56,7 +56,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush nagios: action=downtime minutes=120 service=host host={{ inventory_hostname_short }}{{ env_suffix }} @@ -75,7 +75,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush nagios: action=downtime minutes=120 service=host host={{ inventory_hostname_short }}{{ env_suffix }} @@ -94,7 +94,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush nagios: action=downtime minutes=120 service=host host={{ inventory_hostname_short }}{{ env_suffix }} diff --git a/playbooks/manual/upgrade/fedimg.yml b/playbooks/manual/upgrade/fedimg.yml index 32f8a944df..40ca672dcd 100644 --- a/playbooks/manual/upgrade/fedimg.yml +++ b/playbooks/manual/upgrade/fedimg.yml @@ -8,7 +8,7 @@ vars: testing: False handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" tasks: - name: clean all metadata {%if testing%}(with infrastructure-testing on){%endif%} @@ -34,7 +34,7 @@ vars: testing: False handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" tasks: - name: yum update fedfind packages from main repo @@ -54,7 +54,7 @@ vars: testing: False handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" tasks: - name: yum update fedfind packages from main repo @@ -72,7 +72,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush diff --git a/playbooks/manual/upgrade/fedmsg.yml b/playbooks/manual/upgrade/fedmsg.yml index 454a9cafd0..ea0e206025 100644 --- a/playbooks/manual/upgrade/fedmsg.yml +++ b/playbooks/manual/upgrade/fedmsg.yml @@ -33,7 +33,7 @@ - python2-fedmsg-meta-fedora-infrastructure - python-moksha-hub handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" tasks: - name: clean all metadata {%if testing%}(with infrastructure-testing on){%endif%} @@ -49,7 +49,7 @@ with_items: "{{packages}}" # Restart all the backend daemons -- include: ../restart-fedmsg-services.yml +- include_tasks: ../restart-fedmsg-services.yml # Also restart the frontend web services - name: bounce apache @@ -60,7 +60,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" tasks: - service: name="httpd" state=restarted diff --git a/playbooks/manual/upgrade/fmn.yml b/playbooks/manual/upgrade/fmn.yml index 262168ff2b..a187f1897c 100644 --- a/playbooks/manual/upgrade/fmn.yml +++ b/playbooks/manual/upgrade/fmn.yml @@ -8,7 +8,7 @@ vars: testing: False handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" tasks: - name: clean all metadata {%if testing%}(with infrastructure-testing on){%endif%} @@ -32,7 +32,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush w.r.t. the frontend @@ -54,7 +54,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush w.r.t. the backend @@ -111,7 +111,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" tasks: - service: name="httpd" state=started diff --git a/playbooks/manual/upgrade/hotness.yml b/playbooks/manual/upgrade/hotness.yml index 4de480aff6..cb1c6e64e8 100644 --- a/playbooks/manual/upgrade/hotness.yml +++ b/playbooks/manual/upgrade/hotness.yml @@ -8,7 +8,7 @@ vars: testing: False handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" tasks: - name: clean all metadata {%if testing%}(with infrastructure-testing on){%endif%} @@ -29,7 +29,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush diff --git a/playbooks/manual/upgrade/koschei-testing.yml b/playbooks/manual/upgrade/koschei-testing.yml index fc5893ad55..e6f040af87 100644 --- a/playbooks/manual/upgrade/koschei-testing.yml +++ b/playbooks/manual/upgrade/koschei-testing.yml @@ -1,5 +1,5 @@ --- -- include: koschei.yml +- include_playbook: koschei.yml vars: fedora_repos: - updates-testing diff --git a/playbooks/manual/upgrade/koschei.yml b/playbooks/manual/upgrade/koschei.yml index c3eaadb21e..a017905d53 100644 --- a/playbooks/manual/upgrade/koschei.yml +++ b/playbooks/manual/upgrade/koschei.yml @@ -5,7 +5,7 @@ - /srv/private/ansible/vars.yml - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" roles: - mod_wsgi - koschei/frontend @@ -17,7 +17,7 @@ - /srv/private/ansible/vars.yml - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" roles: - koschei/backend @@ -106,7 +106,7 @@ - /srv/private/ansible/vars.yml - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" roles: - mod_wsgi - koschei/frontend @@ -118,7 +118,7 @@ - /srv/private/ansible/vars.yml - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" roles: - koschei/backend diff --git a/playbooks/manual/upgrade/mbs.yml b/playbooks/manual/upgrade/mbs.yml index f1e9bd55fd..7874e52151 100644 --- a/playbooks/manual/upgrade/mbs.yml +++ b/playbooks/manual/upgrade/mbs.yml @@ -8,7 +8,7 @@ vars: testing: False handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" tasks: - name: clean all metadata {%if testing%}(with infrastructure-testing on){%endif%} @@ -37,7 +37,7 @@ vars: testing: False handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" tasks: - name: clean all metadata {%if testing%}(with infrastructure-testing on){%endif%} @@ -64,7 +64,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush w.r.t. the frontend @@ -87,7 +87,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush w.r.t. the backend @@ -124,7 +124,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" tasks: - service: name="httpd" state=started diff --git a/playbooks/manual/upgrade/mote.yml b/playbooks/manual/upgrade/mote.yml index d1fa68478c..a088b420de 100644 --- a/playbooks/manual/upgrade/mote.yml +++ b/playbooks/manual/upgrade/mote.yml @@ -8,7 +8,7 @@ vars: testing: False handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" tasks: - name: clean all metadata {%if testing%}(with infrastructure-testing on){%endif%} @@ -29,7 +29,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush diff --git a/playbooks/manual/upgrade/odcs.yml b/playbooks/manual/upgrade/odcs.yml index 2fb37c2b9d..701778afad 100644 --- a/playbooks/manual/upgrade/odcs.yml +++ b/playbooks/manual/upgrade/odcs.yml @@ -9,7 +9,7 @@ testing: False odcs_migrate_db: True handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" tasks: - name: clean all metadata {%if testing%}(with infrastructure-tags-stg on){%endif%} @@ -37,7 +37,7 @@ testing: False odcs_migrate_db: True handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" tasks: - name: clean all metadata {%if testing%}(with infrastructure-tags-stg on){%endif%} @@ -64,7 +64,7 @@ vars: odcs_migrate_db: True handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush w.r.t. the frontend @@ -89,7 +89,7 @@ vars: odcs_migrate_db: True handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush w.r.t. the backend @@ -119,7 +119,7 @@ vars: odcs_migrate_db: True handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" tasks: - service: name="httpd" state=started diff --git a/playbooks/manual/upgrade/packages.yml b/playbooks/manual/upgrade/packages.yml index 4e9ab3a819..443fdbb3d8 100644 --- a/playbooks/manual/upgrade/packages.yml +++ b/playbooks/manual/upgrade/packages.yml @@ -8,7 +8,7 @@ vars: testing: False handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" tasks: - name: clean all metadata {%if testing%}(with infrastructure-testing on){%endif%} @@ -29,7 +29,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush diff --git a/playbooks/manual/upgrade/pagure.yml b/playbooks/manual/upgrade/pagure.yml index 875eacb511..ac53c4f7c9 100644 --- a/playbooks/manual/upgrade/pagure.yml +++ b/playbooks/manual/upgrade/pagure.yml @@ -12,7 +12,7 @@ vars: testing: False handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush w.r.t. the frontend diff --git a/playbooks/manual/upgrade/pdc.yml b/playbooks/manual/upgrade/pdc.yml index 9503531c3a..ea6b735216 100644 --- a/playbooks/manual/upgrade/pdc.yml +++ b/playbooks/manual/upgrade/pdc.yml @@ -6,7 +6,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" pre_tasks: - name: clean all metadata @@ -38,7 +38,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" pre_tasks: - name: clean all metadata @@ -78,7 +78,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" tasks: - name: And... start the backend again diff --git a/playbooks/manual/upgrade/statscache.yml b/playbooks/manual/upgrade/statscache.yml index 75e5fceff6..2b1ebeac6b 100644 --- a/playbooks/manual/upgrade/statscache.yml +++ b/playbooks/manual/upgrade/statscache.yml @@ -8,7 +8,7 @@ vars: testing: False handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" tasks: - name: clean all metadata {%if testing%}(with infrastructure-testing on){%endif%} @@ -29,7 +29,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush w.r.t. the frontend @@ -51,7 +51,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush w.r.t. the backend @@ -88,7 +88,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" tasks: - service: name="httpd" state=started diff --git a/playbooks/manual/upgrade/tagger.yml b/playbooks/manual/upgrade/tagger.yml index 3d262f7491..64bdd19afa 100644 --- a/playbooks/manual/upgrade/tagger.yml +++ b/playbooks/manual/upgrade/tagger.yml @@ -8,7 +8,7 @@ vars: testing: False handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" tasks: - name: clean all metadata {%if testing%}(with infrastructure-testing on){%endif%} @@ -29,7 +29,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handllers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush diff --git a/playbooks/restart_unbound.yml b/playbooks/restart_unbound.yml index 848cd6c81a..ac03acd9ab 100644 --- a/playbooks/restart_unbound.yml +++ b/playbooks/restart_unbound.yml @@ -13,4 +13,4 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - - include: "{{ tasks_path }}/restart_unbound.yml" + - include_tasks: "{{ tasks_path }}/restart_unbound.yml" diff --git a/playbooks/transient_cloud_instance.yml b/playbooks/transient_cloud_instance.yml index aecb343160..7c9f610356 100644 --- a/playbooks/transient_cloud_instance.yml +++ b/playbooks/transient_cloud_instance.yml @@ -43,7 +43,7 @@ fail: msg="Please specify the name of the instance" when: name is not defined - - include: "{{ tasks_path }}/transient_cloud.yml" + - include_tasks: "{{ tasks_path }}/transient_cloud.yml" - name: gather facts setup: @@ -75,7 +75,7 @@ command: dnf install -y cloud-utils when: ansible_distribution_major_version|int > 21 and ansible_cmdline.ostree is not defined - - include: "{{ tasks_path }}/cloud_setup_basic.yml" + - include_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/update_ticketkey.yml b/playbooks/update_ticketkey.yml index d138a4b89c..7b680e51ff 100644 --- a/playbooks/update_ticketkey.yml +++ b/playbooks/update_ticketkey.yml @@ -8,7 +8,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - name: create new production ticket key @@ -27,7 +27,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers_path }}/restart_services.yml" + - include_tasks: "{{ handlers_path }}/restart_services.yml" tasks: diff --git a/playbooks/vhost_reboot.yml b/playbooks/vhost_reboot.yml index ad80aaf7a4..6da07e2736 100644 --- a/playbooks/vhost_reboot.yml +++ b/playbooks/vhost_reboot.yml @@ -34,7 +34,7 @@ with_items: "{{ vmlist.list_vms }}" # Call out to another playbook. Disable any proxies that may live here -- include: update-proxy-dns.yml status=disable proxies=myvms_new:&proxies +- include_playbook: update-proxy-dns.yml status=disable proxies=myvms_new:&proxies when: nodns is not defined or not "true" in nodns - name: halt instances @@ -103,7 +103,7 @@ when: nonagios is not defined or not nonagios # Call out to that dns playbook. Put proxies back in now that they're back -- include: update-proxy-dns.yml status=enable proxies=myvms_new:&proxies +- include_playbook: update-proxy-dns.yml status=enable proxies=myvms_new:&proxies when: nodns is not defined or not nodns - name: Fix unbound if necessary @@ -116,7 +116,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - - include: "{{ tasks_path }}/restart_unbound.yml" + - include_tasks: "{{ tasks_path }}/restart_unbound.yml" # - name: get info on guests (postreboot) # virt: command=info diff --git a/playbooks/vhost_update.yml b/playbooks/vhost_update.yml index 183632b377..eece3fd51a 100644 --- a/playbooks/vhost_update.yml +++ b/playbooks/vhost_update.yml @@ -19,7 +19,7 @@ with_items: '{{vmlist.list_vms}}' # Call out to another playbook. Disable any proxies that may live here -#- include: update-proxy-dns.yml status=disable proxies=myvms_new:&proxies +#- include_playbook: update-proxy-dns.yml status=disable proxies=myvms_new:&proxies - name: update the system hosts: "{{ target }}:myvms_new" diff --git a/roles/ansible-server/templates/ansible.cfg.j2 b/roles/ansible-server/templates/ansible.cfg.j2 index 237dfd47aa..c7e386714c 100644 --- a/roles/ansible-server/templates/ansible.cfg.j2 +++ b/roles/ansible-server/templates/ansible.cfg.j2 @@ -186,24 +186,23 @@ handler_includes_static = True # set plugin path directories here, separate with colons #action_plugins = /usr/share/ansible/plugins/action -action_plugins = {{ ansible_base }}/ansible/action_plugins:/usr/share/ansible_plugins/action_plugins +action_plugins = /srv/web/infra/ansible/action_plugins:/usr/lib/python2.7/site-packages/ansible/plugins/action #cache_plugins = /usr/share/ansible/plugins/cache #callback_plugins = /usr/share/ansible/plugins/callback -callback_plugins = {{ ansible_base }}/ansible/callback_plugins:/usr/share/ansible_plugins/callback_plugins +callback_plugins = /srv/web/infra/ansible/callback_plugins:/usr/lib/python2.7/site-packages/ansible/plugins/callback #connection_plugins = /usr/share/ansible/plugins/connection -connection_plugins = {{ ansible_base }}/ansible/connection_plugins:/usr/share/ansible_plugins/connection_plugin +connection_plugins = /srv/web/infra/ansible/connection_plugins:/usr/lib/python2.7/site-packages/ansible/plugins/connection #lookup_plugins = /usr/share/ansible/plugins/lookup -lookup_plugins = {{ ansible_base }}/ansible/lookup_plugins:/usr/share/ansible_plugins/lookup_plugins +lookup_plugins = /srv/web/infra/ansible/lookup_plugins:/usr/lib/python2.7/site-packages/ansible/plugins/lookup #inventory_plugins = /usr/share/ansible/plugins/inventory #vars_plugins = /usr/share/ansible/plugins/vars -vars_plugins = {{ ansible_base }}/ansible/vars_plugins:/usr/share/ansible_plugins/vars_plugins +vars_plugins = /srv/web/infra/ansible/vars_plugins:/usr/lib/python2.7/site-packages/ansible/plugins/vars #filter_plugins = /usr/share/ansible/plugins/filter -filter_plugins = {{ ansible_base }}/ansible/filter_plugins:/usr/share/ansible_plugins/filter_plugins +filter_plugins = /srv/web/infra/ansible/filter_plugins:/usr/lib/python2.7/site-packages/ansible/plugins/filter #test_plugins = /usr/share/ansible/plugins/test #terminal_plugins = /usr/share/ansible/plugins/terminal #strategy_plugins = /usr/share/ansible/plugins/strategy - # by default, ansible will use the 'linear' strategy but you may want to try # another one #strategy = free diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml index b0a109c108..04ce5732bb 100644 --- a/roles/base/tasks/main.yml +++ b/roles/base/tasks/main.yml @@ -335,7 +335,7 @@ - rsyslog-audit - name: Setup postfix - include: postfix.yml + include_tasks: postfix.yml # # This task installs some common scripts to /usr/local/bin @@ -379,7 +379,7 @@ # Watchdog stuff # - name: Set up watchdog - include: watchdog.yml + include_tasks: watchdog.yml #Set PS1 to show stage environment at PS1 @@ -430,4 +430,4 @@ - krb5 - name: Setup host keytab - include: keytab.yml + include_tasks: keytab.yml