From 69fd8d117a3a5ac3064ce6ddfe56003d284bd7da Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sun, 15 Oct 2017 20:29:59 +0000 Subject: [PATCH] switch all the handlers to import and drop the global static import --- playbooks/check-host.yml | 2 +- playbooks/cloud_prep.yml | 2 +- playbooks/groups/anitya.yml | 6 +++--- playbooks/groups/arm-qa.yml | 2 +- playbooks/groups/ask.yml | 2 +- playbooks/groups/autocloud-backend.yml | 4 ++-- playbooks/groups/autocloud-web.yml | 4 ++-- playbooks/groups/backup-server.yml | 2 +- playbooks/groups/badges-backend.yml | 4 ++-- playbooks/groups/badges-web.yml | 2 +- playbooks/groups/basset.yml | 2 +- playbooks/groups/bastion.yml | 2 +- playbooks/groups/batcave.yml | 2 +- playbooks/groups/beaker-virthosts.yml | 2 +- playbooks/groups/beaker.yml | 4 ++-- playbooks/groups/blockerbugs.yml | 2 +- playbooks/groups/bodhi-backend.yml | 2 +- playbooks/groups/bodhi2.yml | 2 +- playbooks/groups/bugyou.yml | 6 +++--- playbooks/groups/bugzilla2fedmsg.yml | 4 ++-- playbooks/groups/buildhw.yml | 2 +- playbooks/groups/buildvm.yml | 10 +++++----- playbooks/groups/busgateway.yml | 4 ++-- playbooks/groups/certgetter.yml | 2 +- playbooks/groups/ci.yml | 4 ++-- playbooks/groups/darkserver-backend.yml | 6 +++--- playbooks/groups/darkserver-web.yml | 2 +- playbooks/groups/darkserver.yml | 2 +- playbooks/groups/datagrepper.yml | 8 ++++---- playbooks/groups/dhcp.yml | 2 +- playbooks/groups/dns.yml | 2 +- playbooks/groups/docker-registry.yml | 2 +- playbooks/groups/download.yml | 4 ++-- playbooks/groups/elections.yml | 6 +++--- playbooks/groups/fas.yml | 2 +- playbooks/groups/fas3.yml | 2 +- playbooks/groups/fedimg.yml | 4 ++-- playbooks/groups/fedocal.yml | 6 +++--- playbooks/groups/freshmaker.yml | 8 ++++---- playbooks/groups/github2fedmsg.yml | 4 ++-- playbooks/groups/gnome-backups.yml | 2 +- playbooks/groups/hotness.yml | 6 +++--- playbooks/groups/infinote.yml | 2 +- playbooks/groups/ipa.yml | 6 +++--- playbooks/groups/ipsilon.yml | 4 ++-- playbooks/groups/jenkins-master.yml | 2 +- playbooks/groups/jenkins-slave.yml | 2 +- playbooks/groups/kerneltest.yml | 4 ++-- playbooks/groups/keyserver.yml | 2 +- playbooks/groups/koji-hub.yml | 2 +- playbooks/groups/kojipkgs.yml | 2 +- playbooks/groups/koschei-backend.yml | 2 +- playbooks/groups/koschei-web.yml | 2 +- playbooks/groups/logserver.yml | 4 ++-- playbooks/groups/loopabull.yml | 6 +++--- playbooks/groups/mailman.yml | 4 ++-- playbooks/groups/maintainer-test.yml | 2 +- playbooks/groups/mariadb-server.yml | 2 +- playbooks/groups/mbs.yml | 12 ++++++------ playbooks/groups/mdapi.yml | 6 +++--- playbooks/groups/memcached.yml | 2 +- playbooks/groups/mirrorlist2.yml | 2 +- playbooks/groups/mirrormanager.yml | 10 +++++----- playbooks/groups/modernpaste.yml | 4 ++-- playbooks/groups/noc.yml | 4 ++-- playbooks/groups/notifs-backend.yml | 4 ++-- playbooks/groups/notifs-web.yml | 2 +- playbooks/groups/nuancier.yml | 6 +++--- playbooks/groups/odcs.yml | 8 ++++---- playbooks/groups/openqa-workers.yml | 2 +- playbooks/groups/openqa.yml | 8 ++++---- playbooks/groups/openstack-compute-nodes.yml | 2 +- playbooks/groups/os-cluster.yml | 2 +- playbooks/groups/osbs-cluster.yml | 2 +- playbooks/groups/osbs-orchestrator-cluster.yml | 2 +- playbooks/groups/packages.yml | 8 ++++---- playbooks/groups/pagure.yml | 4 ++-- playbooks/groups/pdc.yml | 6 +++--- playbooks/groups/people.yml | 2 +- playbooks/groups/piwik.yml | 2 +- playbooks/groups/pkgdb.yml | 6 +++--- playbooks/groups/pkgs.yml | 4 ++-- playbooks/groups/postgresql-server-bdr.yml | 2 +- playbooks/groups/postgresql-server.yml | 2 +- playbooks/groups/proxies.yml | 6 +++--- playbooks/groups/qa.yml | 8 ++++---- playbooks/groups/releng-compose.yml | 2 +- playbooks/groups/resultsdb-dev.yml | 4 ++-- playbooks/groups/resultsdb-prod.yml | 6 +++--- playbooks/groups/resultsdb-stg.yml | 6 +++--- playbooks/groups/retrace.yml | 2 +- playbooks/groups/secondary.yml | 2 +- playbooks/groups/sign-bridge.yml | 2 +- playbooks/groups/smtp-mm.yml | 2 +- playbooks/groups/statscache.yml | 6 +++--- playbooks/groups/summershum.yml | 6 +++--- playbooks/groups/sundries.yml | 2 +- playbooks/groups/tagger.yml | 6 +++--- playbooks/groups/taskotron-client-hosts.yml | 6 +++--- playbooks/groups/taskotron.yml | 6 +++--- playbooks/groups/torrent.yml | 2 +- playbooks/groups/transitional-datanommer.yml | 4 ++-- playbooks/groups/unbound.yml | 2 +- playbooks/groups/value.yml | 2 +- playbooks/groups/virthost.yml | 2 +- playbooks/groups/wiki.yml | 2 +- playbooks/groups/zanata2fedmsg.yml | 4 ++-- .../hosts/ansiblemagazine.fedorainfracloud.org.yml | 2 +- playbooks/hosts/artboard.fedorainfracloud.org.yml | 4 ++-- .../blockerbugs-dev.cloud.fedoraproject.org.yml | 4 ++-- .../hosts/cloud-noc01.cloud.fedoraproject.org.yml | 2 +- playbooks/hosts/commops.fedorainfracloud.org.yml | 2 +- .../hosts/communityblog.fedorainfracloud.org.yml | 2 +- .../hosts/darkserver-dev.fedorainfracloud.org.yml | 2 +- .../hosts/data-analysis01.phx2.fedoraproject.org.yml | 4 ++-- playbooks/hosts/developer.fedorainfracloud.org.yml | 2 +- playbooks/hosts/eclipse.fedorainfracloud.org.yml | 2 +- playbooks/hosts/faitout.fedorainfracloud.org.yml | 2 +- playbooks/hosts/fas2-dev.fedorainfracloud.org.yml | 2 +- playbooks/hosts/fas3-dev.fedorainfracloud.org.yml | 2 +- .../hosts/fed-cloud09.cloud.fedoraproject.org.yml | 2 +- playbooks/hosts/fedimg-dev.fedorainfracloud.org.yml | 4 ++-- .../hosts/fedora-bootstrap.fedorainfracloud.org.yml | 2 +- .../glittergallery-dev.fedorainfracloud.org.yml | 2 +- playbooks/hosts/grafana.cloud.fedoraproject.org.yml | 4 ++-- playbooks/hosts/graphite.fedorainfracloud.org.yml | 4 ++-- playbooks/hosts/hubs-dev.fedorainfracloud.org.yml | 2 +- playbooks/hosts/iddev.fedorainfracloud.org.yml | 4 ++-- playbooks/hosts/insim.fedorainfracloud.org.yml | 2 +- playbooks/hosts/java-deptools.fedorainfracloud.org | 2 +- playbooks/hosts/lists-dev.fedorainfracloud.org.yml | 6 +++--- playbooks/hosts/magazine2.fedorainfracloud.org.yml | 2 +- playbooks/hosts/modernpaste.fedorainfracloud.org.yml | 2 +- playbooks/hosts/modularity.fedorainfracloud.org.yml | 2 +- playbooks/hosts/regcfp2.fedorainfracloud.org.yml | 2 +- playbooks/hosts/respins.fedorainfracloud.org.yml | 2 +- .../hosts/shumgrepper-dev.fedorainfracloud.org.yml | 2 +- playbooks/hosts/taiga.fedorainfracloud.org.yml | 2 +- playbooks/hosts/taigastg.fedorainfracloud.org.yml | 2 +- playbooks/hosts/testdays.fedorainfracloud.org.yml | 4 ++-- .../hosts/upstreamfirst.fedorainfracloud.org.yml | 8 ++++---- playbooks/manual/rebuild/mote.yml | 2 +- playbooks/transient_cloud_instance.yml | 2 +- playbooks/update_ticketkey.yml | 4 ++-- roles/ansible-server/templates/ansible.cfg.j2 | 1 - roles/copr/base/handlers/main.yml | 2 +- roles/copr/frontend/handlers/main.yml | 2 +- roles/copr/mbs/handlers/main.yml | 2 +- 148 files changed, 254 insertions(+), 255 deletions(-) diff --git a/playbooks/check-host.yml b/playbooks/check-host.yml index 62332968df..893cb712a9 100644 --- a/playbooks/check-host.yml +++ b/playbooks/check-host.yml @@ -265,5 +265,5 @@ # handlers: -# - include_tasks: "{{ handlers_path }}/restart_services.yml" +# - import_tasks: "{{ handllers_path }}/restart_services.yml" # - include_tasks: "restart_services.yml" diff --git a/playbooks/cloud_prep.yml b/playbooks/cloud_prep.yml index 411ac184c2..52dfd06224 100644 --- a/playbooks/cloud_prep.yml +++ b/playbooks/cloud_prep.yml @@ -11,4 +11,4 @@ handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/anitya.yml b/playbooks/groups/anitya.yml index 7b1daf48d1..da0fda8327 100644 --- a/playbooks/groups/anitya.yml +++ b/playbooks/groups/anitya.yml @@ -27,7 +27,7 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: set up the frontend bits hosts: anitya-frontend @@ -56,7 +56,7 @@ - anitya handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: set up the backend bits hosts: anitya-backend @@ -76,4 +76,4 @@ - anitya handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/arm-qa.yml b/playbooks/groups/arm-qa.yml index 629d68c38c..e539b6450e 100644 --- a/playbooks/groups/arm-qa.yml +++ b/playbooks/groups/arm-qa.yml @@ -26,4 +26,4 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/ask.yml b/playbooks/groups/ask.yml index f7e72d57e4..74e14c9ad1 100644 --- a/playbooks/groups/ask.yml +++ b/playbooks/groups/ask.yml @@ -31,7 +31,7 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_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 f0f88de57b..0a2a457185 100644 --- a/playbooks/groups/autocloud-backend.yml +++ b/playbooks/groups/autocloud-backend.yml @@ -28,7 +28,7 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_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_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" roles: - redis diff --git a/playbooks/groups/autocloud-web.yml b/playbooks/groups/autocloud-web.yml index 4420b482b2..a1e9b3fa6b 100644 --- a/playbooks/groups/autocloud-web.yml +++ b/playbooks/groups/autocloud-web.yml @@ -31,7 +31,7 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_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_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" roles: - autocloud/frontend diff --git a/playbooks/groups/backup-server.yml b/playbooks/groups/backup-server.yml index b8e1abc67c..3b1fb7e885 100644 --- a/playbooks/groups/backup-server.yml +++ b/playbooks/groups/backup-server.yml @@ -34,4 +34,4 @@ - include_tasks: "{{ tasks_path }}/rdiff_backup_server.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/badges-backend.yml b/playbooks/groups/badges-backend.yml index 1b2fc67d50..4b10c64f24 100644 --- a/playbooks/groups/badges-backend.yml +++ b/playbooks/groups/badges-backend.yml @@ -33,7 +33,7 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_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_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/badges-web.yml b/playbooks/groups/badges-web.yml index ddbae26479..216ce596dd 100644 --- a/playbooks/groups/badges-web.yml +++ b/playbooks/groups/badges-web.yml @@ -44,4 +44,4 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/basset.yml b/playbooks/groups/basset.yml index 86c185da36..c11dbdef13 100644 --- a/playbooks/groups/basset.yml +++ b/playbooks/groups/basset.yml @@ -35,4 +35,4 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/bastion.yml b/playbooks/groups/bastion.yml index 79fd704b18..f6ca8b9987 100644 --- a/playbooks/groups/bastion.yml +++ b/playbooks/groups/bastion.yml @@ -28,7 +28,7 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_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 caa38d6535..9c35bcc856 100644 --- a/playbooks/groups/batcave.yml +++ b/playbooks/groups/batcave.yml @@ -39,4 +39,4 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/beaker-virthosts.yml b/playbooks/groups/beaker-virthosts.yml index da93f086fc..ecdf463bbf 100644 --- a/playbooks/groups/beaker-virthosts.yml +++ b/playbooks/groups/beaker-virthosts.yml @@ -32,4 +32,4 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/beaker.yml b/playbooks/groups/beaker.yml index 976b11ccb5..1efcd83270 100644 --- a/playbooks/groups/beaker.yml +++ b/playbooks/groups/beaker.yml @@ -33,7 +33,7 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_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_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/blockerbugs.yml b/playbooks/groups/blockerbugs.yml index e2000c3b44..27fb8ea3e5 100644 --- a/playbooks/groups/blockerbugs.yml +++ b/playbooks/groups/blockerbugs.yml @@ -31,4 +31,4 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/bodhi-backend.yml b/playbooks/groups/bodhi-backend.yml index 9c4975a47c..2f0e5f34c6 100644 --- a/playbooks/groups/bodhi-backend.yml +++ b/playbooks/groups/bodhi-backend.yml @@ -82,4 +82,4 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/bodhi2.yml b/playbooks/groups/bodhi2.yml index cedf473ec0..721a18a6ce 100644 --- a/playbooks/groups/bodhi2.yml +++ b/playbooks/groups/bodhi2.yml @@ -46,4 +46,4 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/bugyou.yml b/playbooks/groups/bugyou.yml index 5eec46e16b..31bf252a80 100644 --- a/playbooks/groups/bugyou.yml +++ b/playbooks/groups/bugyou.yml @@ -30,7 +30,7 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: set up fedmsg basics hosts: bugyou:bugyou-stg @@ -46,7 +46,7 @@ - fedmsg/base handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_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_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/bugzilla2fedmsg.yml b/playbooks/groups/bugzilla2fedmsg.yml index 4482b84304..b32d8beb53 100644 --- a/playbooks/groups/bugzilla2fedmsg.yml +++ b/playbooks/groups/bugzilla2fedmsg.yml @@ -31,7 +31,7 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_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_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/buildhw.yml b/playbooks/groups/buildhw.yml index db877ef8c5..7bb90a6d66 100644 --- a/playbooks/groups/buildhw.yml +++ b/playbooks/groups/buildhw.yml @@ -38,4 +38,4 @@ service: name=kojid state=started enabled=yes handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/buildvm.yml b/playbooks/groups/buildvm.yml index b4290d0488..e4670a2f65 100644 --- a/playbooks/groups/buildvm.yml +++ b/playbooks/groups/buildvm.yml @@ -51,7 +51,7 @@ service: name=kojid state=started enabled=yes handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: configure osbs on koji builders hosts: buildvm:buildvm-stg @@ -137,7 +137,7 @@ } } handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: configure varnish cache on buildvm-s390x-07.s390.fedoraproject.org @@ -156,7 +156,7 @@ - varnish handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_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_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: configure sshfs target on koji01 hosts: koji01.phx2.fedoraproject.org @@ -218,4 +218,4 @@ - sshfs handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/busgateway.yml b/playbooks/groups/busgateway.yml index a9ebf1806f..c003461f3b 100644 --- a/playbooks/groups/busgateway.yml +++ b/playbooks/groups/busgateway.yml @@ -28,7 +28,7 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_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_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/certgetter.yml b/playbooks/groups/certgetter.yml index 40a99b636f..ed13b50b84 100644 --- a/playbooks/groups/certgetter.yml +++ b/playbooks/groups/certgetter.yml @@ -27,4 +27,4 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/ci.yml b/playbooks/groups/ci.yml index f0ff0c13cc..933cd4c8e2 100644 --- a/playbooks/groups/ci.yml +++ b/playbooks/groups/ci.yml @@ -37,7 +37,7 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: configure resultsdb production hosts: ci @@ -57,4 +57,4 @@ - { role: ccsdb, tags: ['ccsdb'] } handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/darkserver-backend.yml b/playbooks/groups/darkserver-backend.yml index aa7a209578..adcd9b90d2 100644 --- a/playbooks/groups/darkserver-backend.yml +++ b/playbooks/groups/darkserver-backend.yml @@ -36,7 +36,7 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: set up fedmsg basics hosts: darkserver-backend:darkserver-backend-stg @@ -52,7 +52,7 @@ - fedmsg/base handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_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_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/darkserver-web.yml b/playbooks/groups/darkserver-web.yml index 95a35b41b8..504d153086 100644 --- a/playbooks/groups/darkserver-web.yml +++ b/playbooks/groups/darkserver-web.yml @@ -36,5 +36,5 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/darkserver.yml b/playbooks/groups/darkserver.yml index ff99e20743..3d0001dad2 100644 --- a/playbooks/groups/darkserver.yml +++ b/playbooks/groups/darkserver.yml @@ -37,4 +37,4 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/datagrepper.yml b/playbooks/groups/datagrepper.yml index 5010196390..06e4b77009 100644 --- a/playbooks/groups/datagrepper.yml +++ b/playbooks/groups/datagrepper.yml @@ -32,7 +32,7 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: dole out the service-specific config hosts: datagrepper:datagrepper-stg @@ -52,7 +52,7 @@ interval: 15 handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_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_tasks: "{{ handlers_path }}/restart_services.yml" +# - import_tasks: "{{ handllers_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_tasks: "{{ handlers_path }}/restart_services.yml" +# - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/dhcp.yml b/playbooks/groups/dhcp.yml index be56fe0d19..b158722709 100644 --- a/playbooks/groups/dhcp.yml +++ b/playbooks/groups/dhcp.yml @@ -27,4 +27,4 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/dns.yml b/playbooks/groups/dns.yml index d8ba1e140b..f1c72f277b 100644 --- a/playbooks/groups/dns.yml +++ b/playbooks/groups/dns.yml @@ -31,4 +31,4 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/docker-registry.yml b/playbooks/groups/docker-registry.yml index 230ffc8921..054c04a7f8 100644 --- a/playbooks/groups/docker-registry.yml +++ b/playbooks/groups/docker-registry.yml @@ -29,7 +29,7 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: set up gluster on stg hosts: diff --git a/playbooks/groups/download.yml b/playbooks/groups/download.yml index 1fed4f6e3f..dedc1e97f7 100644 --- a/playbooks/groups/download.yml +++ b/playbooks/groups/download.yml @@ -13,7 +13,7 @@ tasks: handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: post-initial-steps @@ -68,5 +68,5 @@ handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/elections.yml b/playbooks/groups/elections.yml index e8c8180034..51504cb908 100644 --- a/playbooks/groups/elections.yml +++ b/playbooks/groups/elections.yml @@ -29,7 +29,7 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: set up fedmsg on elections hosts: elections:elections-stg @@ -45,7 +45,7 @@ - fedmsg/base handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: deploy elections itself hosts: elections:elections-stg @@ -61,5 +61,5 @@ - elections handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/fas.yml b/playbooks/groups/fas.yml index 7df2df50a9..22364e0524 100644 --- a/playbooks/groups/fas.yml +++ b/playbooks/groups/fas.yml @@ -35,4 +35,4 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/fas3.yml b/playbooks/groups/fas3.yml index a5125057ef..7cc9601927 100644 --- a/playbooks/groups/fas3.yml +++ b/playbooks/groups/fas3.yml @@ -35,4 +35,4 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/fedimg.yml b/playbooks/groups/fedimg.yml index ec1be56af4..734a3539a1 100644 --- a/playbooks/groups/fedimg.yml +++ b/playbooks/groups/fedimg.yml @@ -33,7 +33,7 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_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_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/fedocal.yml b/playbooks/groups/fedocal.yml index ae0e5326fd..d877e1bc64 100644 --- a/playbooks/groups/fedocal.yml +++ b/playbooks/groups/fedocal.yml @@ -29,7 +29,7 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: set up fedmsg hosts: fedocal-stg:fedocal @@ -45,7 +45,7 @@ - fedmsg/base handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: deploy fedocal itself hosts: fedocal-stg:fedocal @@ -61,4 +61,4 @@ - fedocal handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/freshmaker.yml b/playbooks/groups/freshmaker.yml index 8933eb5d12..f13d76958e 100644 --- a/playbooks/groups/freshmaker.yml +++ b/playbooks/groups/freshmaker.yml @@ -28,7 +28,7 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: openvpn on the prod frontend nodes hosts: freshmaker-frontend @@ -44,7 +44,7 @@ - openvpn/client handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_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_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_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_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/github2fedmsg.yml b/playbooks/groups/github2fedmsg.yml index 7b43639920..9a839014fd 100644 --- a/playbooks/groups/github2fedmsg.yml +++ b/playbooks/groups/github2fedmsg.yml @@ -34,7 +34,7 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_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_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" roles: - github2fedmsg diff --git a/playbooks/groups/gnome-backups.yml b/playbooks/groups/gnome-backups.yml index 1122ee818d..c3941a40a1 100644 --- a/playbooks/groups/gnome-backups.yml +++ b/playbooks/groups/gnome-backups.yml @@ -30,4 +30,4 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/hotness.yml b/playbooks/groups/hotness.yml index e105435d36..247bc05db2 100644 --- a/playbooks/groups/hotness.yml +++ b/playbooks/groups/hotness.yml @@ -37,7 +37,7 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: set up fedmsg basics hosts: hotness:hotness-stg @@ -53,7 +53,7 @@ - fedmsg/base handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_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_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/infinote.yml b/playbooks/groups/infinote.yml index 73f4e68224..193327e1be 100644 --- a/playbooks/groups/infinote.yml +++ b/playbooks/groups/infinote.yml @@ -34,4 +34,4 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/ipa.yml b/playbooks/groups/ipa.yml index 265c9dcea1..2e8d709257 100644 --- a/playbooks/groups/ipa.yml +++ b/playbooks/groups/ipa.yml @@ -28,7 +28,7 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: deploy ipa itself hosts: ipa:ipa-stg @@ -51,7 +51,7 @@ - combine IPA http keytabs handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" tasks: - name: Combine IPA keytabs @@ -100,4 +100,4 @@ - base handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/ipsilon.yml b/playbooks/groups/ipsilon.yml index bf16099836..2fbdbd4037 100644 --- a/playbooks/groups/ipsilon.yml +++ b/playbooks/groups/ipsilon.yml @@ -45,7 +45,7 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: deploy ipsilon itself hosts: ipsilon:ipsilon-stg @@ -61,4 +61,4 @@ - ipsilon handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/jenkins-master.yml b/playbooks/groups/jenkins-master.yml index 01b892c2c2..4dad4e47f0 100644 --- a/playbooks/groups/jenkins-master.yml +++ b/playbooks/groups/jenkins-master.yml @@ -45,4 +45,4 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/jenkins-slave.yml b/playbooks/groups/jenkins-slave.yml index e92c84b1ea..191e0ae260 100644 --- a/playbooks/groups/jenkins-slave.yml +++ b/playbooks/groups/jenkins-slave.yml @@ -44,4 +44,4 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/kerneltest.yml b/playbooks/groups/kerneltest.yml index 55ce3350d0..0e544ff253 100644 --- a/playbooks/groups/kerneltest.yml +++ b/playbooks/groups/kerneltest.yml @@ -34,7 +34,7 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_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_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" roles: - kerneltest diff --git a/playbooks/groups/keyserver.yml b/playbooks/groups/keyserver.yml index 6c9b346440..937723ba2f 100644 --- a/playbooks/groups/keyserver.yml +++ b/playbooks/groups/keyserver.yml @@ -35,4 +35,4 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/koji-hub.yml b/playbooks/groups/koji-hub.yml index 8aba744af2..376c9ab9ee 100644 --- a/playbooks/groups/koji-hub.yml +++ b/playbooks/groups/koji-hub.yml @@ -87,7 +87,7 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_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 7b71030613..7ecf7220d8 100644 --- a/playbooks/groups/kojipkgs.yml +++ b/playbooks/groups/kojipkgs.yml @@ -37,4 +37,4 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/koschei-backend.yml b/playbooks/groups/koschei-backend.yml index c0a2108fc7..ef1533b473 100644 --- a/playbooks/groups/koschei-backend.yml +++ b/playbooks/groups/koschei-backend.yml @@ -35,4 +35,4 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/koschei-web.yml b/playbooks/groups/koschei-web.yml index 4f1b85b120..a29e8a3495 100644 --- a/playbooks/groups/koschei-web.yml +++ b/playbooks/groups/koschei-web.yml @@ -29,4 +29,4 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/logserver.yml b/playbooks/groups/logserver.yml index 90490cef29..cf7b4d3921 100644 --- a/playbooks/groups/logserver.yml +++ b/playbooks/groups/logserver.yml @@ -43,7 +43,7 @@ copy: src="{{ files }}/logserver/fixfiles_exclude_dirs" dest=/etc/selinux/fixfiles_exclude_dirs owner=root mode=0644 handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: Cloud Image stats hosts: log01.phx2.fedoraproject.org @@ -63,4 +63,4 @@ nfs_src_dir: 'fedora_stats' handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/loopabull.yml b/playbooks/groups/loopabull.yml index 0ca3ecc4cf..74a3a5598c 100644 --- a/playbooks/groups/loopabull.yml +++ b/playbooks/groups/loopabull.yml @@ -28,7 +28,7 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_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_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_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_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" tasks: - name: Enable fedmsg-rabbitmq-serializer diff --git a/playbooks/groups/mailman.yml b/playbooks/groups/mailman.yml index 3e310791f9..6b0d4e4502 100644 --- a/playbooks/groups/mailman.yml +++ b/playbooks/groups/mailman.yml @@ -34,7 +34,7 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" # @@ -119,4 +119,4 @@ when: inventory_hostname.startswith('mailman01.phx2') or inventory_hostname.startswith('lists-dev') handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/maintainer-test.yml b/playbooks/groups/maintainer-test.yml index 624f3de44b..9141ba76ae 100644 --- a/playbooks/groups/maintainer-test.yml +++ b/playbooks/groups/maintainer-test.yml @@ -68,4 +68,4 @@ - config handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/mariadb-server.yml b/playbooks/groups/mariadb-server.yml index 69bc3936ca..05710cbdcc 100644 --- a/playbooks/groups/mariadb-server.yml +++ b/playbooks/groups/mariadb-server.yml @@ -34,4 +34,4 @@ # TODO: add iscsi task handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/mbs.yml b/playbooks/groups/mbs.yml index 3d708ab05a..9fb67a6b7f 100644 --- a/playbooks/groups/mbs.yml +++ b/playbooks/groups/mbs.yml @@ -28,7 +28,7 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: openvpn on the prod frontend nodes hosts: mbs-frontend @@ -44,7 +44,7 @@ - openvpn/client handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_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_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_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_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_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_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_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_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/mdapi.yml b/playbooks/groups/mdapi.yml index 0636c3bb95..6a2ddb91e5 100644 --- a/playbooks/groups/mdapi.yml +++ b/playbooks/groups/mdapi.yml @@ -31,7 +31,7 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_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_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: set up fedmsg hosts: mdapi-stg:mdapi @@ -64,4 +64,4 @@ - fedmsg/base handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/memcached.yml b/playbooks/groups/memcached.yml index ce48cb5745..07c84d653d 100644 --- a/playbooks/groups/memcached.yml +++ b/playbooks/groups/memcached.yml @@ -27,4 +27,4 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/mirrorlist2.yml b/playbooks/groups/mirrorlist2.yml index 18fb6ea5ab..dc33c12d1f 100644 --- a/playbooks/groups/mirrorlist2.yml +++ b/playbooks/groups/mirrorlist2.yml @@ -70,4 +70,4 @@ handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/mirrormanager.yml b/playbooks/groups/mirrormanager.yml index 4883c36750..e215bf1c51 100644 --- a/playbooks/groups/mirrormanager.yml +++ b/playbooks/groups/mirrormanager.yml @@ -27,7 +27,7 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: Deploy the backend hosts: mm-backend:mm-backend-stg @@ -45,7 +45,7 @@ - geoip handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_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_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: Deploy the frontend (web-app) hosts: mm-frontend:mm-frontend-stg @@ -80,7 +80,7 @@ - mirrormanager/frontend2 handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_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_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/modernpaste.yml b/playbooks/groups/modernpaste.yml index 037037fbf0..014d84a8fd 100644 --- a/playbooks/groups/modernpaste.yml +++ b/playbooks/groups/modernpaste.yml @@ -32,7 +32,7 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_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_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/noc.yml b/playbooks/groups/noc.yml index 128d7f4c51..90829a1838 100644 --- a/playbooks/groups/noc.yml +++ b/playbooks/groups/noc.yml @@ -45,7 +45,7 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_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_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_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 7edb24f29d..93a91ce6d9 100644 --- a/playbooks/groups/notifs-backend.yml +++ b/playbooks/groups/notifs-backend.yml @@ -35,7 +35,7 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_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_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/notifs-web.yml b/playbooks/groups/notifs-web.yml index f9984e4e07..dcc8c389fc 100644 --- a/playbooks/groups/notifs-web.yml +++ b/playbooks/groups/notifs-web.yml @@ -35,4 +35,4 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/nuancier.yml b/playbooks/groups/nuancier.yml index bfced0be1b..0ff8b43c32 100644 --- a/playbooks/groups/nuancier.yml +++ b/playbooks/groups/nuancier.yml @@ -33,7 +33,7 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: set up fedmsg hosts: nuancier:nuancier-stg @@ -49,7 +49,7 @@ - fedmsg/base handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: set up gluster on stg hosts: nuancier-stg @@ -125,4 +125,4 @@ - nuancier handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/odcs.yml b/playbooks/groups/odcs.yml index a26b43caae..7982da1380 100644 --- a/playbooks/groups/odcs.yml +++ b/playbooks/groups/odcs.yml @@ -28,7 +28,7 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: openvpn on the prod frontend nodes hosts: odcs-frontend @@ -44,7 +44,7 @@ - openvpn/client handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_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_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_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_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/openqa-workers.yml b/playbooks/groups/openqa-workers.yml index f2a08ed599..f8e5d739f9 100644 --- a/playbooks/groups/openqa-workers.yml +++ b/playbooks/groups/openqa-workers.yml @@ -25,4 +25,4 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/openqa.yml b/playbooks/groups/openqa.yml index 798dc1f8b6..f323eb26b9 100644 --- a/playbooks/groups/openqa.yml +++ b/playbooks/groups/openqa.yml @@ -28,7 +28,7 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: configure openQA hosts: openqa:openqa-stg @@ -54,7 +54,7 @@ - { role: autocloudreporter, tags: ['autocloudreporter'] } handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_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_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: set up openQA server data NFS mounts (prod) hosts: openqa @@ -100,4 +100,4 @@ tags: ['nfs_client'] handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/openstack-compute-nodes.yml b/playbooks/groups/openstack-compute-nodes.yml index 1314bf1934..187eb70ece 100644 --- a/playbooks/groups/openstack-compute-nodes.yml +++ b/playbooks/groups/openstack-compute-nodes.yml @@ -26,4 +26,4 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/os-cluster.yml b/playbooks/groups/os-cluster.yml index 39f6c3a584..0dae5a5eff 100644 --- a/playbooks/groups/os-cluster.yml +++ b/playbooks/groups/os-cluster.yml @@ -47,7 +47,7 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_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 678f7cd703..b0d1b082f9 100644 --- a/playbooks/groups/osbs-cluster.yml +++ b/playbooks/groups/osbs-cluster.yml @@ -28,7 +28,7 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_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 3d3cbcad70..ae042284a9 100644 --- a/playbooks/groups/osbs-orchestrator-cluster.yml +++ b/playbooks/groups/osbs-orchestrator-cluster.yml @@ -29,7 +29,7 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_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 2d47e7622e..b92a170b28 100644 --- a/playbooks/groups/packages.yml +++ b/playbooks/groups/packages.yml @@ -36,7 +36,7 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: set up gluster server on prod hosts: packages @@ -58,7 +58,7 @@ datadir: /srv/glusterfs/packages handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: set up gluster client on prod hosts: packages @@ -84,7 +84,7 @@ mountdir: /var/cache/fedoracommunity handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_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_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/pagure.yml b/playbooks/groups/pagure.yml index 9a7c82ef5d..781f7946d4 100644 --- a/playbooks/groups/pagure.yml +++ b/playbooks/groups/pagure.yml @@ -27,7 +27,7 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: deploy pagure itself hosts: pagure:pagure-stg @@ -56,4 +56,4 @@ - pagure/fedmsg handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/pdc.yml b/playbooks/groups/pdc.yml index dcc5320584..543d7e13d1 100644 --- a/playbooks/groups/pdc.yml +++ b/playbooks/groups/pdc.yml @@ -11,7 +11,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" roles: - base @@ -36,7 +36,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_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_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" roles: - fedmsg/base diff --git a/playbooks/groups/people.yml b/playbooks/groups/people.yml index 9422478234..f6c70c9213 100644 --- a/playbooks/groups/people.yml +++ b/playbooks/groups/people.yml @@ -86,4 +86,4 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/piwik.yml b/playbooks/groups/piwik.yml index 633cb79b40..97dd2aac33 100644 --- a/playbooks/groups/piwik.yml +++ b/playbooks/groups/piwik.yml @@ -30,4 +30,4 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/pkgdb.yml b/playbooks/groups/pkgdb.yml index 32b67ff1eb..cd6450f403 100644 --- a/playbooks/groups/pkgdb.yml +++ b/playbooks/groups/pkgdb.yml @@ -32,7 +32,7 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: set up fedmsg on pkgdb hosts: pkgdb-stg:pkgdb @@ -48,7 +48,7 @@ - fedmsg/base handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: deploy pkgdb itself hosts: pkgdb-stg:pkgdb @@ -64,4 +64,4 @@ - pkgdb2 handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/pkgs.yml b/playbooks/groups/pkgs.yml index b540dbe72d..9a0ca9648b 100644 --- a/playbooks/groups/pkgs.yml +++ b/playbooks/groups/pkgs.yml @@ -55,7 +55,7 @@ - include_tasks: "{{ tasks_path }}/2fa_client.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: setup fedmsg on pkgs hosts: pkgs-stg:pkgs02.phx2.fedoraproject.org @@ -73,4 +73,4 @@ - fedmsg/hub handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/postgresql-server-bdr.yml b/playbooks/groups/postgresql-server-bdr.yml index 077c4adb29..9641001489 100644 --- a/playbooks/groups/postgresql-server-bdr.yml +++ b/playbooks/groups/postgresql-server-bdr.yml @@ -36,4 +36,4 @@ # TODO: add iscsi task handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/postgresql-server.yml b/playbooks/groups/postgresql-server.yml index d900df2097..c66e000cce 100644 --- a/playbooks/groups/postgresql-server.yml +++ b/playbooks/groups/postgresql-server.yml @@ -38,4 +38,4 @@ # TODO: add iscsi task handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/proxies.yml b/playbooks/groups/proxies.yml index a44cfe0bd4..7baeeabd65 100644 --- a/playbooks/groups/proxies.yml +++ b/playbooks/groups/proxies.yml @@ -58,7 +58,7 @@ #- include_tasks: "{{ tasks_path }}/mod_wsgi.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" # TODO @@ -90,7 +90,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" pre_tasks: # @@ -190,7 +190,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" pre_tasks: # diff --git a/playbooks/groups/qa.yml b/playbooks/groups/qa.yml index f4ea874ed3..7be3d09841 100644 --- a/playbooks/groups/qa.yml +++ b/playbooks/groups/qa.yml @@ -36,7 +36,7 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: configure phabricator hosts: qa-prod:qa-stg @@ -54,7 +54,7 @@ - { role: phabricator, tags: ['phabricator'] } handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: configure qa buildbot CI @@ -74,7 +74,7 @@ - { role: taskotron/buildslave-configure, tags: ['buildslaveconfig'] } handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_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_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/releng-compose.yml b/playbooks/groups/releng-compose.yml index e0e97fba3d..a2078546d8 100644 --- a/playbooks/groups/releng-compose.yml +++ b/playbooks/groups/releng-compose.yml @@ -81,4 +81,4 @@ when: ansible_architecture != "ppc64" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/resultsdb-dev.yml b/playbooks/groups/resultsdb-dev.yml index 4be24636eb..3eef489ea1 100644 --- a/playbooks/groups/resultsdb-dev.yml +++ b/playbooks/groups/resultsdb-dev.yml @@ -33,7 +33,7 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: configure resultsdb and execdb hosts: resultsdb-dev @@ -51,5 +51,5 @@ - { role: taskotron/execdb, tags: ['execdb'] } handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/resultsdb-prod.yml b/playbooks/groups/resultsdb-prod.yml index 26a6d6aa7e..bfa44a22bd 100644 --- a/playbooks/groups/resultsdb-prod.yml +++ b/playbooks/groups/resultsdb-prod.yml @@ -34,7 +34,7 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: configure resultsdb production hosts: resultsdb-prod @@ -53,7 +53,7 @@ - { role: taskotron/execdb, tags: ['execdb'] } handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: Install rdbsync hosts: resultsdb-prod @@ -61,7 +61,7 @@ gather_facts: True handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_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 0511245157..3c3f7c024d 100644 --- a/playbooks/groups/resultsdb-stg.yml +++ b/playbooks/groups/resultsdb-stg.yml @@ -33,7 +33,7 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: configure resultsdb hosts: resultsdb-stg @@ -52,7 +52,7 @@ - { role: taskotron/execdb, tags: ['execdb'] } handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: Install rdbsync hosts: resultsdb-stg @@ -60,7 +60,7 @@ gather_facts: True handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_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 e9565416ae..b312ac7810 100644 --- a/playbooks/groups/retrace.yml +++ b/playbooks/groups/retrace.yml @@ -25,7 +25,7 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_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 4e941f116f..a78839116f 100644 --- a/playbooks/groups/secondary.yml +++ b/playbooks/groups/secondary.yml @@ -71,4 +71,4 @@ cron_file=update-fullfiletimelist handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/sign-bridge.yml b/playbooks/groups/sign-bridge.yml index a4923f955e..9161685c5c 100644 --- a/playbooks/groups/sign-bridge.yml +++ b/playbooks/groups/sign-bridge.yml @@ -37,4 +37,4 @@ - include_tasks: "{{ tasks_path }}/2fa_client.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/smtp-mm.yml b/playbooks/groups/smtp-mm.yml index d8588bbd93..57b91cba24 100644 --- a/playbooks/groups/smtp-mm.yml +++ b/playbooks/groups/smtp-mm.yml @@ -29,4 +29,4 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/statscache.yml b/playbooks/groups/statscache.yml index 197e14732c..497d17e25c 100644 --- a/playbooks/groups/statscache.yml +++ b/playbooks/groups/statscache.yml @@ -14,7 +14,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" roles: - base @@ -40,7 +40,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_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_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" roles: - fedmsg/hub diff --git a/playbooks/groups/summershum.yml b/playbooks/groups/summershum.yml index a58e282e35..7d93c6f6cf 100644 --- a/playbooks/groups/summershum.yml +++ b/playbooks/groups/summershum.yml @@ -34,7 +34,7 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: set up fedmsg basics hosts: summershum:summershum-stg @@ -50,7 +50,7 @@ - fedmsg/base handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_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_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/sundries.yml b/playbooks/groups/sundries.yml index 2018ffed77..d043266f68 100644 --- a/playbooks/groups/sundries.yml +++ b/playbooks/groups/sundries.yml @@ -62,4 +62,4 @@ when: master_sundries_node and env == "staging" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/tagger.yml b/playbooks/groups/tagger.yml index 73edbac6c7..72529ebc61 100644 --- a/playbooks/groups/tagger.yml +++ b/playbooks/groups/tagger.yml @@ -34,7 +34,7 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: dole out the service specific config hosts: tagger:tagger-stg @@ -50,7 +50,7 @@ - tagger handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_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_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/taskotron-client-hosts.yml b/playbooks/groups/taskotron-client-hosts.yml index 84bbdb0f85..e31ecce586 100644 --- a/playbooks/groups/taskotron-client-hosts.yml +++ b/playbooks/groups/taskotron-client-hosts.yml @@ -32,7 +32,7 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_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_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_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_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/taskotron.yml b/playbooks/groups/taskotron.yml index 0c2f0ef6af..fecaa9fa7c 100644 --- a/playbooks/groups/taskotron.yml +++ b/playbooks/groups/taskotron.yml @@ -36,7 +36,7 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_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_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: configure standalone taskotron host hosts: taskotron-dev @@ -78,4 +78,4 @@ - { role: taskotron/ssl-taskotron, tags: ['ssltaskotron'] } handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/torrent.yml b/playbooks/groups/torrent.yml index 3372c88e4c..8229697ea4 100644 --- a/playbooks/groups/torrent.yml +++ b/playbooks/groups/torrent.yml @@ -40,4 +40,4 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/transitional-datanommer.yml b/playbooks/groups/transitional-datanommer.yml index d6e25d8d9d..44a5fc10c5 100644 --- a/playbooks/groups/transitional-datanommer.yml +++ b/playbooks/groups/transitional-datanommer.yml @@ -27,7 +27,7 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_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_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/unbound.yml b/playbooks/groups/unbound.yml index 81392e063d..750563a7b3 100644 --- a/playbooks/groups/unbound.yml +++ b/playbooks/groups/unbound.yml @@ -28,4 +28,4 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/value.yml b/playbooks/groups/value.yml index a6d06c33de..152bd8e3d0 100644 --- a/playbooks/groups/value.yml +++ b/playbooks/groups/value.yml @@ -35,4 +35,4 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/virthost.yml b/playbooks/groups/virthost.yml index 8df3910490..27f4fc49aa 100644 --- a/playbooks/groups/virthost.yml +++ b/playbooks/groups/virthost.yml @@ -32,4 +32,4 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/wiki.yml b/playbooks/groups/wiki.yml index 44be715968..31946798fb 100644 --- a/playbooks/groups/wiki.yml +++ b/playbooks/groups/wiki.yml @@ -40,4 +40,4 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/groups/zanata2fedmsg.yml b/playbooks/groups/zanata2fedmsg.yml index 6c69d147fa..3c2dd8b730 100644 --- a/playbooks/groups/zanata2fedmsg.yml +++ b/playbooks/groups/zanata2fedmsg.yml @@ -34,7 +34,7 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_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_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" roles: - zanata2fedmsg diff --git a/playbooks/hosts/ansiblemagazine.fedorainfracloud.org.yml b/playbooks/hosts/ansiblemagazine.fedorainfracloud.org.yml index 2b556ecc28..b32239fd95 100644 --- a/playbooks/hosts/ansiblemagazine.fedorainfracloud.org.yml +++ b/playbooks/hosts/ansiblemagazine.fedorainfracloud.org.yml @@ -12,7 +12,7 @@ - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: setup all the things hosts: ansiblemagazine.fedorainfracloud.org diff --git a/playbooks/hosts/artboard.fedorainfracloud.org.yml b/playbooks/hosts/artboard.fedorainfracloud.org.yml index 75ccc685e4..8863fef695 100644 --- a/playbooks/hosts/artboard.fedorainfracloud.org.yml +++ b/playbooks/hosts/artboard.fedorainfracloud.org.yml @@ -12,7 +12,7 @@ - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: setup all the things hosts: artboard.fedorainfracloud.org @@ -125,4 +125,4 @@ - artboard handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_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 207c504473..2604dbc1df 100644 --- a/playbooks/hosts/blockerbugs-dev.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/blockerbugs-dev.cloud.fedoraproject.org.yml @@ -12,7 +12,7 @@ - include_tasks: "{{ tasks_path }}/growroot_cloud.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: provision instance hosts: blockerbugs-dev.cloud.fedoraproject.org @@ -36,4 +36,4 @@ mount: name=/srv/persistent src='LABEL=blockerbugs-dev' fstype=ext4 state=mounted handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_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 f25894e4b4..2e104b4ef3 100644 --- a/playbooks/hosts/cloud-noc01.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/cloud-noc01.cloud.fedoraproject.org.yml @@ -27,5 +27,5 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/hosts/commops.fedorainfracloud.org.yml b/playbooks/hosts/commops.fedorainfracloud.org.yml index 78e841c622..dd4bdda8c5 100644 --- a/playbooks/hosts/commops.fedorainfracloud.org.yml +++ b/playbooks/hosts/commops.fedorainfracloud.org.yml @@ -12,7 +12,7 @@ - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: setup all the things hosts: commops.fedorainfracloud.org diff --git a/playbooks/hosts/communityblog.fedorainfracloud.org.yml b/playbooks/hosts/communityblog.fedorainfracloud.org.yml index 58e63fa01a..302ced927e 100644 --- a/playbooks/hosts/communityblog.fedorainfracloud.org.yml +++ b/playbooks/hosts/communityblog.fedorainfracloud.org.yml @@ -12,7 +12,7 @@ - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: setup all the things hosts: communityblog.fedorainfracloud.org diff --git a/playbooks/hosts/darkserver-dev.fedorainfracloud.org.yml b/playbooks/hosts/darkserver-dev.fedorainfracloud.org.yml index 2e7e5f09f3..abf4acc52b 100644 --- a/playbooks/hosts/darkserver-dev.fedorainfracloud.org.yml +++ b/playbooks/hosts/darkserver-dev.fedorainfracloud.org.yml @@ -13,7 +13,7 @@ - include_tasks: "{{ tasks_path }}/growroot_cloud_el7.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: setup all the things hosts: darkserver-dev.fedorainfracloud.org diff --git a/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml b/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml index 65639091af..dfe966121e 100644 --- a/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml +++ b/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml @@ -35,7 +35,7 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_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_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_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 e174271ad7..2f17d1a034 100644 --- a/playbooks/hosts/developer.fedorainfracloud.org.yml +++ b/playbooks/hosts/developer.fedorainfracloud.org.yml @@ -12,7 +12,7 @@ - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: setup all the things hosts: developer.fedorainfracloud.org diff --git a/playbooks/hosts/eclipse.fedorainfracloud.org.yml b/playbooks/hosts/eclipse.fedorainfracloud.org.yml index cee393cbc4..a0f74429c2 100644 --- a/playbooks/hosts/eclipse.fedorainfracloud.org.yml +++ b/playbooks/hosts/eclipse.fedorainfracloud.org.yml @@ -12,7 +12,7 @@ - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: setup all the things hosts: eclipse.fedorainfracloud.org diff --git a/playbooks/hosts/faitout.fedorainfracloud.org.yml b/playbooks/hosts/faitout.fedorainfracloud.org.yml index fc95666d3c..21960a81cd 100644 --- a/playbooks/hosts/faitout.fedorainfracloud.org.yml +++ b/playbooks/hosts/faitout.fedorainfracloud.org.yml @@ -12,7 +12,7 @@ - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: setup all the things hosts: faitout.fedorainfracloud.org diff --git a/playbooks/hosts/fas2-dev.fedorainfracloud.org.yml b/playbooks/hosts/fas2-dev.fedorainfracloud.org.yml index 26da31971e..9013002d37 100644 --- a/playbooks/hosts/fas2-dev.fedorainfracloud.org.yml +++ b/playbooks/hosts/fas2-dev.fedorainfracloud.org.yml @@ -12,7 +12,7 @@ - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: setup all the things hosts: fas2-dev.fedorainfracloud.org diff --git a/playbooks/hosts/fas3-dev.fedorainfracloud.org.yml b/playbooks/hosts/fas3-dev.fedorainfracloud.org.yml index 8dc50bf6fa..4f97472635 100644 --- a/playbooks/hosts/fas3-dev.fedorainfracloud.org.yml +++ b/playbooks/hosts/fas3-dev.fedorainfracloud.org.yml @@ -12,7 +12,7 @@ - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: setup all the things hosts: fas3-dev.fedorainfracloud.org diff --git a/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml b/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml index 8fc869d0b9..48d32ba7e0 100644 --- a/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml @@ -41,7 +41,7 @@ - sudo handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" tasks: - include_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" diff --git a/playbooks/hosts/fedimg-dev.fedorainfracloud.org.yml b/playbooks/hosts/fedimg-dev.fedorainfracloud.org.yml index 92958a526f..b3a9e16af6 100644 --- a/playbooks/hosts/fedimg-dev.fedorainfracloud.org.yml +++ b/playbooks/hosts/fedimg-dev.fedorainfracloud.org.yml @@ -12,7 +12,7 @@ - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: setup all the things hosts: fedimg-dev.fedorainfracloud.org @@ -28,7 +28,7 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" pre_tasks: - include_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" diff --git a/playbooks/hosts/fedora-bootstrap.fedorainfracloud.org.yml b/playbooks/hosts/fedora-bootstrap.fedorainfracloud.org.yml index d187db388d..a321e491b1 100644 --- a/playbooks/hosts/fedora-bootstrap.fedorainfracloud.org.yml +++ b/playbooks/hosts/fedora-bootstrap.fedorainfracloud.org.yml @@ -12,7 +12,7 @@ - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: setup all the things hosts: fedora-bootstrap.fedorainfracloud.org diff --git a/playbooks/hosts/glittergallery-dev.fedorainfracloud.org.yml b/playbooks/hosts/glittergallery-dev.fedorainfracloud.org.yml index ba4533d26a..549966aa9f 100644 --- a/playbooks/hosts/glittergallery-dev.fedorainfracloud.org.yml +++ b/playbooks/hosts/glittergallery-dev.fedorainfracloud.org.yml @@ -12,7 +12,7 @@ - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: setup all the things hosts: glittergallery-dev.fedorainfracloud.org diff --git a/playbooks/hosts/grafana.cloud.fedoraproject.org.yml b/playbooks/hosts/grafana.cloud.fedoraproject.org.yml index 4932b1e5e1..8119033dab 100644 --- a/playbooks/hosts/grafana.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/grafana.cloud.fedoraproject.org.yml @@ -12,7 +12,7 @@ - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: setup all the things hosts: grafana.cloud.fedoraproject.org @@ -38,7 +38,7 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" pre_tasks: - include_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" diff --git a/playbooks/hosts/graphite.fedorainfracloud.org.yml b/playbooks/hosts/graphite.fedorainfracloud.org.yml index c979c92932..10e0bc50b9 100644 --- a/playbooks/hosts/graphite.fedorainfracloud.org.yml +++ b/playbooks/hosts/graphite.fedorainfracloud.org.yml @@ -12,7 +12,7 @@ - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: setup all the things hosts: graphite.fedorainfracloud.org @@ -38,7 +38,7 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" pre_tasks: - include_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" diff --git a/playbooks/hosts/hubs-dev.fedorainfracloud.org.yml b/playbooks/hosts/hubs-dev.fedorainfracloud.org.yml index b6e194f84c..1236adaf75 100644 --- a/playbooks/hosts/hubs-dev.fedorainfracloud.org.yml +++ b/playbooks/hosts/hubs-dev.fedorainfracloud.org.yml @@ -12,7 +12,7 @@ - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: setup all the things diff --git a/playbooks/hosts/iddev.fedorainfracloud.org.yml b/playbooks/hosts/iddev.fedorainfracloud.org.yml index d1f92af6ce..edf9118002 100644 --- a/playbooks/hosts/iddev.fedorainfracloud.org.yml +++ b/playbooks/hosts/iddev.fedorainfracloud.org.yml @@ -12,7 +12,7 @@ - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: setup all the things hosts: iddev.fedorainfracloud.org @@ -39,4 +39,4 @@ hostname: name="{{inventory_hostname}}" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/hosts/insim.fedorainfracloud.org.yml b/playbooks/hosts/insim.fedorainfracloud.org.yml index 0adc9bd107..c80e33c02c 100644 --- a/playbooks/hosts/insim.fedorainfracloud.org.yml +++ b/playbooks/hosts/insim.fedorainfracloud.org.yml @@ -13,7 +13,7 @@ - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: setup all the things hosts: insim.fedorainfracloud.org diff --git a/playbooks/hosts/java-deptools.fedorainfracloud.org b/playbooks/hosts/java-deptools.fedorainfracloud.org index ad7fe292a2..a56592b599 100644 --- a/playbooks/hosts/java-deptools.fedorainfracloud.org +++ b/playbooks/hosts/java-deptools.fedorainfracloud.org @@ -12,7 +12,7 @@ - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: setup all the things hosts: java-deptools.fedorainfracloud.org diff --git a/playbooks/hosts/lists-dev.fedorainfracloud.org.yml b/playbooks/hosts/lists-dev.fedorainfracloud.org.yml index ebdc0f1f2d..2ab300d26c 100644 --- a/playbooks/hosts/lists-dev.fedorainfracloud.org.yml +++ b/playbooks/hosts/lists-dev.fedorainfracloud.org.yml @@ -12,7 +12,7 @@ - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: setup all the things hosts: lists-dev.fedorainfracloud.org @@ -86,7 +86,7 @@ owner=root group=root mode=0440 handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: restart postgresql service: name=postgresql state=restarted @@ -171,6 +171,6 @@ handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_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 ec84f8cff0..e13828942e 100644 --- a/playbooks/hosts/magazine2.fedorainfracloud.org.yml +++ b/playbooks/hosts/magazine2.fedorainfracloud.org.yml @@ -12,7 +12,7 @@ - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: setup all the things hosts: magazine2.fedorainfracloud.org diff --git a/playbooks/hosts/modernpaste.fedorainfracloud.org.yml b/playbooks/hosts/modernpaste.fedorainfracloud.org.yml index 75314c234b..bb4e264a82 100644 --- a/playbooks/hosts/modernpaste.fedorainfracloud.org.yml +++ b/playbooks/hosts/modernpaste.fedorainfracloud.org.yml @@ -12,7 +12,7 @@ - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: setup all the things hosts: modernpaste.fedorainfracloud.org diff --git a/playbooks/hosts/modularity.fedorainfracloud.org.yml b/playbooks/hosts/modularity.fedorainfracloud.org.yml index 9caa33c0c4..8a4a2c2008 100644 --- a/playbooks/hosts/modularity.fedorainfracloud.org.yml +++ b/playbooks/hosts/modularity.fedorainfracloud.org.yml @@ -12,7 +12,7 @@ - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: setup all the things hosts: modularity.fedorainfracloud.org:modularity2.fedorainfracloud.org diff --git a/playbooks/hosts/regcfp2.fedorainfracloud.org.yml b/playbooks/hosts/regcfp2.fedorainfracloud.org.yml index 4e0a207d6e..4d048fbf87 100644 --- a/playbooks/hosts/regcfp2.fedorainfracloud.org.yml +++ b/playbooks/hosts/regcfp2.fedorainfracloud.org.yml @@ -12,7 +12,7 @@ - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: setup all the things hosts: regcfp2.fedorainfracloud.org diff --git a/playbooks/hosts/respins.fedorainfracloud.org.yml b/playbooks/hosts/respins.fedorainfracloud.org.yml index 2d83899221..d286e4d633 100644 --- a/playbooks/hosts/respins.fedorainfracloud.org.yml +++ b/playbooks/hosts/respins.fedorainfracloud.org.yml @@ -12,7 +12,7 @@ - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: setup all the things hosts: respins.fedorainfracloud.org diff --git a/playbooks/hosts/shumgrepper-dev.fedorainfracloud.org.yml b/playbooks/hosts/shumgrepper-dev.fedorainfracloud.org.yml index cd5653cbe6..fe0ba7c7b1 100644 --- a/playbooks/hosts/shumgrepper-dev.fedorainfracloud.org.yml +++ b/playbooks/hosts/shumgrepper-dev.fedorainfracloud.org.yml @@ -12,7 +12,7 @@ - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: setup all the things hosts: shumgrepper-dev.fedorainfracloud.org diff --git a/playbooks/hosts/taiga.fedorainfracloud.org.yml b/playbooks/hosts/taiga.fedorainfracloud.org.yml index 511e2942b4..c7912fc8cb 100644 --- a/playbooks/hosts/taiga.fedorainfracloud.org.yml +++ b/playbooks/hosts/taiga.fedorainfracloud.org.yml @@ -12,7 +12,7 @@ - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: setup all the things hosts: taiga.fedorainfracloud.org diff --git a/playbooks/hosts/taigastg.fedorainfracloud.org.yml b/playbooks/hosts/taigastg.fedorainfracloud.org.yml index ec98912bdf..c4c644c699 100644 --- a/playbooks/hosts/taigastg.fedorainfracloud.org.yml +++ b/playbooks/hosts/taigastg.fedorainfracloud.org.yml @@ -12,7 +12,7 @@ - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: setup all the things hosts: taigastg.fedorainfracloud.org diff --git a/playbooks/hosts/testdays.fedorainfracloud.org.yml b/playbooks/hosts/testdays.fedorainfracloud.org.yml index 00194df6a8..bf6c9f181b 100644 --- a/playbooks/hosts/testdays.fedorainfracloud.org.yml +++ b/playbooks/hosts/testdays.fedorainfracloud.org.yml @@ -13,7 +13,7 @@ - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: setup all the things hosts: testdays.fedorainfracloud.org @@ -49,5 +49,5 @@ - { role: testdays, tags: ['testdays'] } handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/hosts/upstreamfirst.fedorainfracloud.org.yml b/playbooks/hosts/upstreamfirst.fedorainfracloud.org.yml index eac59f2e18..3a57c5d36c 100644 --- a/playbooks/hosts/upstreamfirst.fedorainfracloud.org.yml +++ b/playbooks/hosts/upstreamfirst.fedorainfracloud.org.yml @@ -12,7 +12,7 @@ - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: do base configuration hosts: upstreamfirst.fedorainfracloud.org @@ -41,7 +41,7 @@ - include_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: deploy pagure hosts: upstreamfirst.fedorainfracloud.org @@ -70,7 +70,7 @@ # - pagure/fedmsg handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" - name: deploy ufmonitor hosts: upstreamfirst.fedorainfracloud.org @@ -86,4 +86,4 @@ - { role: ufmonitor, tags: ['ufmonitor'] } handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/manual/rebuild/mote.yml b/playbooks/manual/rebuild/mote.yml index c44bcd704f..2051a231a0 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_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" tasks: - file: dest=/var/cache/httpd/mote/cache.json state=absent diff --git a/playbooks/transient_cloud_instance.yml b/playbooks/transient_cloud_instance.yml index 7c9f610356..07a07d7a86 100644 --- a/playbooks/transient_cloud_instance.yml +++ b/playbooks/transient_cloud_instance.yml @@ -78,4 +78,4 @@ - include_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" diff --git a/playbooks/update_ticketkey.yml b/playbooks/update_ticketkey.yml index 7b680e51ff..188c0f7c83 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_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_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_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handllers_path }}/restart_services.yml" tasks: diff --git a/roles/ansible-server/templates/ansible.cfg.j2 b/roles/ansible-server/templates/ansible.cfg.j2 index d1bf9c79dc..11ad355329 100644 --- a/roles/ansible-server/templates/ansible.cfg.j2 +++ b/roles/ansible-server/templates/ansible.cfg.j2 @@ -83,7 +83,6 @@ callback_whitelist = fedmsg_callback2,profile_tasks,logdetail2 # 1.x versions. #task_includes_static = True #handler_includes_static = True -handler_includes_static = True # Controls if a missing handler for a notification event is an error or a warning #error_on_missing_handler = True diff --git a/roles/copr/base/handlers/main.yml b/roles/copr/base/handlers/main.yml index f0c5926d91..5efb70972c 100644 --- a/roles/copr/base/handlers/main.yml +++ b/roles/copr/base/handlers/main.yml @@ -1,5 +1,5 @@ --- -- include_tasks: "{{ handlers_path }}/restart_services.yml" +- import_tasks: "{{ handllers_path }}/restart_services.yml" - name: restart postgresql service: name=postgresql state=restarted diff --git a/roles/copr/frontend/handlers/main.yml b/roles/copr/frontend/handlers/main.yml index c17d344764..08da39ff0d 100644 --- a/roles/copr/frontend/handlers/main.yml +++ b/roles/copr/frontend/handlers/main.yml @@ -1,4 +1,4 @@ -- include_tasks: "{{ handlers_path }}/restart_services.yml" +- import_tasks: "{{ handllers_path }}/restart_services.yml" - name: restart postgresql service: name=postgresql diff --git a/roles/copr/mbs/handlers/main.yml b/roles/copr/mbs/handlers/main.yml index b0765a8229..813cc87bef 100644 --- a/roles/copr/mbs/handlers/main.yml +++ b/roles/copr/mbs/handlers/main.yml @@ -1,4 +1,4 @@ -- include_tasks: "{{ handlers_path }}/restart_services.yml" +- import_tasks: "{{ handllers_path }}/restart_services.yml" - name: daemon reload command: systemctl daemon-reload