commit f25fbb9c9a24856d78921a4e6d12d573996d14cb Author: Nicolas Chauvet <kwizart(a)gmail.com&gt; Date: Tue Feb 6 11:20:48 2018 +0100 Update variable for tasks roles handlers playbooks/check-host.yml | 2 +- playbooks/check_base.yml | 6 +++--- playbooks/cloud_prep.yml | 4 ++-- playbooks/groups/arm-packager.yml | 6 +++--- playbooks/groups/autosign.yml | 8 ++++---- playbooks/groups/backup-server.yml | 10 +++++----- playbooks/groups/bastion.yml | 8 ++++---- playbooks/groups/batcave.yml | 8 ++++---- playbooks/groups/bodhi-backend.yml | 8 ++++---- playbooks/groups/bodhi2.yml | 10 +++++----- playbooks/groups/bugzilla.yml | 10 +++++----- playbooks/groups/buildhw.yml | 4 ++-- playbooks/groups/buildvm.yml | 10 +++++----- playbooks/groups/darkserver-backend.yml | 12 ++++++------ playbooks/groups/darkserver-web.yml | 8 ++++---- playbooks/groups/dhcp.yml | 8 ++++---- playbooks/groups/dns.yml | 8 ++++---- playbooks/groups/fas.yml | 10 +++++----- playbooks/groups/github2fedmsg.yml | 12 ++++++------ playbooks/groups/ipsilon.yml | 12 ++++++------ playbooks/groups/koji-hub.yml | 12 ++++++------ playbooks/groups/kojipkgs.yml | 8 ++++---- playbooks/groups/logserver.yml | 8 ++++---- playbooks/groups/mailman.yml | 12 ++++++------ playbooks/groups/mariadb-server.yml | 8 ++++---- playbooks/groups/memcached.yml | 8 ++++---- playbooks/groups/mirrorlist2.yml | 8 ++++---- playbooks/groups/mirrormanager.yml | 16 ++++++++-------- playbooks/groups/moin.yml | 10 +++++----- playbooks/groups/noc.yml | 12 ++++++------ playbooks/groups/notifs-backend.yml | 10 +++++----- playbooks/groups/notifs-web.yml | 10 +++++----- playbooks/groups/osbs-master.yml | 8 ++++---- playbooks/groups/packages.yml | 16 ++++++++-------- playbooks/groups/pkgdb.yml | 14 +++++++------- playbooks/groups/pkgs.yml | 10 +++++----- playbooks/groups/postgresql-server.yml | 8 ++++---- playbooks/groups/proxies.yml | 16 ++++++++-------- playbooks/groups/sign-bridge.yml | 8 ++++---- playbooks/groups/smtp-mm.yml | 8 ++++---- playbooks/groups/squid.xml | 4 ++-- playbooks/groups/virthost.yml | 8 ++++---- playbooks/hosts/hv01.online.rpmfusion.net.yml | 6 +++--- playbooks/include/proxies-certificates.yml | 2 +- playbooks/include/proxies-fedora-web.yml | 2 +- playbooks/include/proxies-haproxy.yml | 2 +- playbooks/include/proxies-redirects.yml | 2 +- playbooks/include/proxies-reverseproxy.yml | 2 +- playbooks/include/proxies-rewrites.yml | 2 +- playbooks/include/proxies-websites.yml | 2 +- playbooks/include/virt-create.yml | 4 ++-- playbooks/manual/kernel-qa.yml | 6 +++--- playbooks/manual/qadevel.yml | 14 +++++++------- playbooks/manual/sign-vault.yml | 10 +++++----- playbooks/manual/update-firmware.yml | 2 +- playbooks/restart_unbound.yml | 2 +- playbooks/update_ticketkey.yml | 4 ++-- playbooks/vhost_reboot.yml | 2 +- 58 files changed, 225 insertions(+), 225 deletions(-) --- diff --git a/playbooks/check-host.yml b/playbooks/check-host.yml index 7379e18..52e30d9 100644 --- a/playbooks/check-host.yml +++ b/playbooks/check-host.yml @@ -265,5 +265,5 @@ # handlers: -# - include: "{{ handlers }}/restart_services.yml" +# - import_tasks: "{{ handlers_path }}/restart_services.yml" # - include: "restart_services.yml" diff --git a/playbooks/check_base.yml b/playbooks/check_base.yml index 9a4e037..f8a9a38 100644 --- a/playbooks/check_base.yml +++ b/playbooks/check_base.yml @@ -11,6 +11,6 @@ tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" diff --git a/playbooks/cloud_prep.yml b/playbooks/cloud_prep.yml index e592087..eee222a 100644 --- a/playbooks/cloud_prep.yml +++ b/playbooks/cloud_prep.yml @@ -7,8 +7,8 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - - include: "{{ tasks }}/cloud_setup_basic.yml" + - import_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/arm-packager.yml b/playbooks/groups/arm-packager.yml index f83a83f..9f6baff 100644 --- a/playbooks/groups/arm-packager.yml +++ b/playbooks/groups/arm-packager.yml @@ -12,7 +12,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" roles: - base @@ -23,7 +23,7 @@ tasks: # this is how you include other task lists - - include: "{{ tasks }}/motd.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" - name: install packager tools (dnf) dnf: state=present pkg={{ item }} @@ -42,4 +42,4 @@ - config handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/autosign.yml b/playbooks/groups/autosign.yml index 1729d1b..369ab22 100644 --- a/playbooks/groups/autosign.yml +++ b/playbooks/groups/autosign.yml @@ -25,9 +25,9 @@ - sudo tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/backup-server.yml b/playbooks/groups/backup-server.yml index 82bf97e..48723ba 100644 --- a/playbooks/groups/backup-server.yml +++ b/playbooks/groups/backup-server.yml @@ -28,10 +28,10 @@ - openvpn/client tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/rdiff_backup_server.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/rdiff_backup_server.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/bastion.yml b/playbooks/groups/bastion.yml index 9a01aaf..d8990bf 100644 --- a/playbooks/groups/bastion.yml +++ b/playbooks/groups/bastion.yml @@ -22,12 +22,12 @@ - { role: packager_alias, when: not inventory_hostname.startswith('bastion-comm01') } tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: configure bastion-qa hosts: bastion-qa diff --git a/playbooks/groups/batcave.yml b/playbooks/groups/batcave.yml index 961eab4..19a5667 100644 --- a/playbooks/groups/batcave.yml +++ b/playbooks/groups/batcave.yml @@ -34,9 +34,9 @@ - { role: nfs/client, mnt_dir: '/mnt/fedora/app', nfs_src_dir: 'fedora_app/app' } tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/bodhi-backend.yml b/playbooks/groups/bodhi-backend.yml index 38780b3..d60f613 100644 --- a/playbooks/groups/bodhi-backend.yml +++ b/playbooks/groups/bodhi-backend.yml @@ -54,9 +54,9 @@ file: src=/mnt/fedora_koji_prod/koji dest=/mnt/koji/vol/prod state=link tags: bodhi when: env == 'staging' - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/motd.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/bodhi2.yml b/playbooks/groups/bodhi2.yml index b9af783..71af460 100644 --- a/playbooks/groups/bodhi2.yml +++ b/playbooks/groups/bodhi2.yml @@ -24,10 +24,10 @@ - { role: fedmsg/base, when: "inventory_hostname.startswith('bodhi0')" } tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/mod_wsgi.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/mod_wsgi.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/bugzilla.yml b/playbooks/groups/bugzilla.yml index b903d70..63cf3ec 100644 --- a/playbooks/groups/bugzilla.yml +++ b/playbooks/groups/bugzilla.yml @@ -25,12 +25,12 @@ - apache tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: deploy bugzilla itself @@ -47,4 +47,4 @@ - bugzilla handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/buildhw.yml b/playbooks/groups/buildhw.yml index 35137fd..7e16dc6 100644 --- a/playbooks/groups/buildhw.yml +++ b/playbooks/groups/buildhw.yml @@ -31,9 +31,9 @@ when: not inventory_hostname.startswith('bkernel') - import_tasks: "{{ tasks_path }}/motd.yml" when: not inventory_hostname.startswith('bkernel') - - include: "{{ tasks }}/create_swap_file.yml swap_file_path=/var/swap-file swap_file_bs=1M swap_file_count=4096" + - import_tasks: "{{ tasks_path }}/create_swap_file.yml swap_file_path=/var/swap-file swap_file_bs=1M swap_file_count=4096" when: inventory_hostname.endswith('scaleway.rpmfusion.net') - - include: "{{ tasks }}/openvpn_client.yml" + - import_tasks: "{{ tasks_path }}/openvpn_client.yml" when: not datacenter == 'online' - name: make sure kojid is running diff --git a/playbooks/groups/buildvm.yml b/playbooks/groups/buildvm.yml index ebc8238..3cd5027 100644 --- a/playbooks/groups/buildvm.yml +++ b/playbooks/groups/buildvm.yml @@ -16,7 +16,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" roles: - base @@ -28,15 +28,15 @@ - koji_builder tasks: - - include: "{{ tasks }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" when: not inventory_hostname.startswith('bkernel') - - include: "{{ tasks }}/motd.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" when: not inventory_hostname.startswith('bkernel') - - include: "{{ tasks }}/openvpn_client.yml" + - import_tasks: "{{ tasks_path }}/openvpn_client.yml" when: not datacenter == 'online' - name: make sure kojid is running service: name=kojid state=running enabled=yes handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/darkserver-backend.yml b/playbooks/groups/darkserver-backend.yml index 65b352f..2c64953 100644 --- a/playbooks/groups/darkserver-backend.yml +++ b/playbooks/groups/darkserver-backend.yml @@ -30,12 +30,12 @@ - role: apache tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: set up fedmsg basics hosts: darkserver-backend:darkserver-backend-stg @@ -51,7 +51,7 @@ - fedmsg/base handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: dole out the service-specific config hosts: darkserver-backend:darkserver-backend-stg @@ -70,4 +70,4 @@ process: fedmsg-hub handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/darkserver-web.yml b/playbooks/groups/darkserver-web.yml index 24c3cff..a8ab841 100644 --- a/playbooks/groups/darkserver-web.yml +++ b/playbooks/groups/darkserver-web.yml @@ -30,10 +30,10 @@ - darkserver/web tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/dhcp.yml b/playbooks/groups/dhcp.yml index 55f2572..23c041d 100644 --- a/playbooks/groups/dhcp.yml +++ b/playbooks/groups/dhcp.yml @@ -22,9 +22,9 @@ - tftp_server tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/dns.yml b/playbooks/groups/dns.yml index ee69526..6c0ef4b 100644 --- a/playbooks/groups/dns.yml +++ b/playbooks/groups/dns.yml @@ -26,9 +26,9 @@ - dns tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/fas.yml b/playbooks/groups/fas.yml index a434c4a..fb9a9b6 100644 --- a/playbooks/groups/fas.yml +++ b/playbooks/groups/fas.yml @@ -29,10 +29,10 @@ # - totpcgi tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/mod_wsgi.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/mod_wsgi.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/github2fedmsg.yml b/playbooks/groups/github2fedmsg.yml index ac8264a..7b5abf3 100644 --- a/playbooks/groups/github2fedmsg.yml +++ b/playbooks/groups/github2fedmsg.yml @@ -29,13 +29,13 @@ - apache tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/mod_wsgi.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/mod_wsgi.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: deploy service-specific config hosts: github2fedmsg:github2fedmsg-stg @@ -48,7 +48,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" roles: - github2fedmsg diff --git a/playbooks/groups/ipsilon.yml b/playbooks/groups/ipsilon.yml index af6d6fd..d2aa2dd 100644 --- a/playbooks/groups/ipsilon.yml +++ b/playbooks/groups/ipsilon.yml @@ -26,13 +26,13 @@ - apache tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/mod_wsgi.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/mod_wsgi.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: deploy ipsilon itself hosts: ipsilon:ipsilon-stg @@ -48,4 +48,4 @@ - ipsilon handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/koji-hub.yml b/playbooks/groups/koji-hub.yml index b6dfe9e..8242a9f 100644 --- a/playbooks/groups/koji-hub.yml +++ b/playbooks/groups/koji-hub.yml @@ -17,8 +17,8 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks }}/osbs_certs.yml" - - include: "{{ tasks }}/osbs_repos.yml" + - import_tasks: "{{ tasks_path }}/osbs_certs.yml" + - import_tasks: "{{ tasks_path }}/osbs_repos.yml" roles: - base @@ -59,12 +59,12 @@ file: src=/mnt/fedora_koji_prod/koji dest=/mnt/koji/vol/prod state=link tags: koji_hub when: env == 'staging' - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" #- name: Start the kojid builder daemon, but only on staging. diff --git a/playbooks/groups/kojipkgs.yml b/playbooks/groups/kojipkgs.yml index d2baa22..c17eb3a 100644 --- a/playbooks/groups/kojipkgs.yml +++ b/playbooks/groups/kojipkgs.yml @@ -31,9 +31,9 @@ - kojipkgs tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/logserver.yml b/playbooks/groups/logserver.yml index 20712db..16320a8 100644 --- a/playbooks/groups/logserver.yml +++ b/playbooks/groups/logserver.yml @@ -24,9 +24,9 @@ - awstats tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" # # We exclude some dirs from restorecon on updates on logservers as they are very large @@ -36,5 +36,5 @@ copy: src="{{ files }}/logserver/fixfiles_exclude_dirs" dest=/etc/selinux/fixfiles_exclude_dirs owner=root mode=0644 handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/mailman.yml b/playbooks/groups/mailman.yml index 2fbb2aa..f4ecca1 100644 --- a/playbooks/groups/mailman.yml +++ b/playbooks/groups/mailman.yml @@ -27,13 +27,13 @@ tasks: # this is how you include other task lists - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/mod_wsgi.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/mod_wsgi.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" # @@ -118,4 +118,4 @@ - postfix handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/mariadb-server.yml b/playbooks/groups/mariadb-server.yml index f03cb01..fb92a99 100644 --- a/playbooks/groups/mariadb-server.yml +++ b/playbooks/groups/mariadb-server.yml @@ -27,11 +27,11 @@ - sudo tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" # TODO: add iscsi task handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/memcached.yml b/playbooks/groups/memcached.yml index 0e0fea2..27cc2a0 100644 --- a/playbooks/groups/memcached.yml +++ b/playbooks/groups/memcached.yml @@ -22,9 +22,9 @@ - memcached tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/mirrorlist2.yml b/playbooks/groups/mirrorlist2.yml index 3cf1ddf..1c74d22 100644 --- a/playbooks/groups/mirrorlist2.yml +++ b/playbooks/groups/mirrorlist2.yml @@ -24,8 +24,8 @@ tags: - packages - base - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/mod_wsgi.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/mod_wsgi.yml" - name: Install policycoreutils-python yum: pkg=policycoreutils-python state=present @@ -42,7 +42,7 @@ tasks: # this is how you include other task lists - - include: "{{ tasks }}/motd.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" roles: - hosts @@ -50,4 +50,4 @@ - mirrormanager/mirrorlist2 handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/mirrormanager.yml b/playbooks/groups/mirrormanager.yml index 57cd531..130814f 100644 --- a/playbooks/groups/mirrormanager.yml +++ b/playbooks/groups/mirrormanager.yml @@ -22,12 +22,12 @@ - { role: nfs/client, when: inventory_hostname.startswith('mm-backend01'), mnt_dir: '/srv/pub', nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub' } tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: Deploy the backend hosts: mm-backend:mm-backend-stg @@ -45,7 +45,7 @@ - geoip handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: Deploy the crawler hosts: mm-crawler:mm-crawler-stg @@ -64,7 +64,7 @@ - { role: openvpn/client, when: datacenter != "online" } handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: Deploy the frontend (web-app) hosts: mm-frontend:mm-frontend-stg @@ -80,7 +80,7 @@ - mirrormanager/frontend2 handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" # Do this one last, since the mirrormanager user needs to exist so that it can # own the fedmsg certs we put in place here. @@ -98,4 +98,4 @@ - fedmsg/base handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/moin.yml b/playbooks/groups/moin.yml index 7bdb014..127cb0e 100644 --- a/playbooks/groups/moin.yml +++ b/playbooks/groups/moin.yml @@ -25,12 +25,12 @@ - apache tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: deploy moin itself @@ -47,4 +47,4 @@ - moin handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/noc.yml b/playbooks/groups/noc.yml index c8ad9a1..8ccee02 100644 --- a/playbooks/groups/noc.yml +++ b/playbooks/groups/noc.yml @@ -24,13 +24,13 @@ - apache tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/mod_wsgi.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/mod_wsgi.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: deploy service-specific config (just for production) hosts: nagios @@ -44,7 +44,7 @@ - "/srv/web/infra/ansible/vars/nagios.{{ inventory_hostname_short }}.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" roles: - { role: dhcp_server, when: datacenter == 'online' } diff --git a/playbooks/groups/notifs-backend.yml b/playbooks/groups/notifs-backend.yml index 4a34c1c..5c2f79e 100644 --- a/playbooks/groups/notifs-backend.yml +++ b/playbooks/groups/notifs-backend.yml @@ -30,12 +30,12 @@ # when: env != "staging" } tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: dole out the service-specific config hosts: notifs-backend:notifs-backend-stg @@ -63,4 +63,4 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/notifs-web.yml b/playbooks/groups/notifs-web.yml index afb8c7f..501df8c 100644 --- a/playbooks/groups/notifs-web.yml +++ b/playbooks/groups/notifs-web.yml @@ -30,10 +30,10 @@ when: env != "staging" } tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/mod_wsgi.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/mod_wsgi.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/osbs-master.yml b/playbooks/groups/osbs-master.yml index ff54033..08bf760 100644 --- a/playbooks/groups/osbs-master.yml +++ b/playbooks/groups/osbs-master.yml @@ -22,12 +22,12 @@ - sudo tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: pre-install osbs tasks hosts: osbs:osbs-stg diff --git a/playbooks/groups/packages.yml b/playbooks/groups/packages.yml index a1e0632..063faa2 100644 --- a/playbooks/groups/packages.yml +++ b/playbooks/groups/packages.yml @@ -29,13 +29,13 @@ - apache tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/mod_wsgi.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/mod_wsgi.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: set up gluster server on prod hosts: packages @@ -57,7 +57,7 @@ datadir: /srv/glusterfs/packages handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: set up gluster client on prod hosts: packages @@ -83,7 +83,7 @@ mountdir: /var/cache/fedoracommunity handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: dole out the new service specific config hosts: packages:packages-stg @@ -102,4 +102,4 @@ process: fedmsg-hub handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/pkgdb.yml b/playbooks/groups/pkgdb.yml index a144989..dacd742 100644 --- a/playbooks/groups/pkgdb.yml +++ b/playbooks/groups/pkgdb.yml @@ -25,13 +25,13 @@ - apache tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/mod_wsgi.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/mod_wsgi.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: set up fedmsg on pkgdb hosts: pkgdb-stg:pkgdb @@ -47,7 +47,7 @@ - fedmsg/base handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: deploy pkgdb itself hosts: pkgdb-stg:pkgdb @@ -63,4 +63,4 @@ - pkgdb2 handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/pkgs.yml b/playbooks/groups/pkgs.yml index 11828d0..e7cb856 100644 --- a/playbooks/groups/pkgs.yml +++ b/playbooks/groups/pkgs.yml @@ -32,12 +32,12 @@ tags: distgit tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" # setup minimal proxy includes - include: /srv/web/infra/ansible/playbooks/include/proxies-certificates.yml @@ -63,4 +63,4 @@ - fedmsg/hub handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/postgresql-server.yml b/playbooks/groups/postgresql-server.yml index 47cf53d..e72417a 100644 --- a/playbooks/groups/postgresql-server.yml +++ b/playbooks/groups/postgresql-server.yml @@ -29,11 +29,11 @@ - koji_db tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" # TODO: add iscsi task handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/proxies.yml b/playbooks/groups/proxies.yml index 271fd08..15bc709 100644 --- a/playbooks/groups/proxies.yml +++ b/playbooks/groups/proxies.yml @@ -24,18 +24,18 @@ - apache tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" # You might think we would want these tasks on the proxy nodes, but they # actually deliver a configuration that our proxy-specific roles below then go # and overwrite... so, let's just leave them out. - #- include: "{{ tasks }}/apache.yml" - #- include: "{{ tasks }}/mod_wsgi.yml" + #- import_tasks: "{{ tasks_path }}/apache.yml" + #- import_tasks: "{{ tasks_path }}/mod_wsgi.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" # TODO @@ -67,7 +67,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" pre_tasks: # @@ -135,7 +135,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" pre_tasks: # diff --git a/playbooks/groups/sign-bridge.yml b/playbooks/groups/sign-bridge.yml index ebd038b..56191dc 100644 --- a/playbooks/groups/sign-bridge.yml +++ b/playbooks/groups/sign-bridge.yml @@ -31,9 +31,9 @@ - sigul/bridge tasks: - - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/smtp-mm.yml b/playbooks/groups/smtp-mm.yml index 44db455..9933e95 100644 --- a/playbooks/groups/smtp-mm.yml +++ b/playbooks/groups/smtp-mm.yml @@ -24,9 +24,9 @@ when: env != "staging" } tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/squid.xml b/playbooks/groups/squid.xml index 2dd9367..7306b2a 100644 --- a/playbooks/groups/squid.xml +++ b/playbooks/groups/squid.xml @@ -24,8 +24,8 @@ - squid tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - include: "{{ handlers }}/restart_services.yml" diff --git a/playbooks/groups/virthost.yml b/playbooks/groups/virthost.yml index 0269d3f..d1c1377 100644 --- a/playbooks/groups/virthost.yml +++ b/playbooks/groups/virthost.yml @@ -25,9 +25,9 @@ - virthost tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/hosts/hv01.online.rpmfusion.net.yml b/playbooks/hosts/hv01.online.rpmfusion.net.yml index f2caeed..4e89e64 100644 --- a/playbooks/hosts/hv01.online.rpmfusion.net.yml +++ b/playbooks/hosts/hv01.online.rpmfusion.net.yml @@ -28,8 +28,8 @@ tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/include/proxies-certificates.yml b/playbooks/include/proxies-certificates.yml index ffcff93..8ecea0f 100644 --- a/playbooks/include/proxies-certificates.yml +++ b/playbooks/include/proxies-certificates.yml @@ -9,7 +9,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" roles: diff --git a/playbooks/include/proxies-fedora-web.yml b/playbooks/include/proxies-fedora-web.yml index 917221a..b59fb00 100644 --- a/playbooks/include/proxies-fedora-web.yml +++ b/playbooks/include/proxies-fedora-web.yml @@ -9,7 +9,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" roles: diff --git a/playbooks/include/proxies-haproxy.yml b/playbooks/include/proxies-haproxy.yml index 4f5ad75..1158351 100644 --- a/playbooks/include/proxies-haproxy.yml +++ b/playbooks/include/proxies-haproxy.yml @@ -9,7 +9,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" roles: diff --git a/playbooks/include/proxies-redirects.yml b/playbooks/include/proxies-redirects.yml index 22e93d9..9638be2 100644 --- a/playbooks/include/proxies-redirects.yml +++ b/playbooks/include/proxies-redirects.yml @@ -9,7 +9,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" roles: diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml index bd47797..c8d5239 100644 --- a/playbooks/include/proxies-reverseproxy.yml +++ b/playbooks/include/proxies-reverseproxy.yml @@ -9,7 +9,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" roles: diff --git a/playbooks/include/proxies-rewrites.yml b/playbooks/include/proxies-rewrites.yml index 41cf042..78b1109 100644 --- a/playbooks/include/proxies-rewrites.yml +++ b/playbooks/include/proxies-rewrites.yml @@ -9,7 +9,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" roles: diff --git a/playbooks/include/proxies-websites.yml b/playbooks/include/proxies-websites.yml index 09839ec..d01ea87 100644 --- a/playbooks/include/proxies-websites.yml +++ b/playbooks/include/proxies-websites.yml @@ -9,7 +9,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" pre_tasks: diff --git a/playbooks/include/virt-create.yml b/playbooks/include/virt-create.yml index 061c3cd..48efb79 100644 --- a/playbooks/include/virt-create.yml +++ b/playbooks/include/virt-create.yml @@ -8,8 +8,8 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - - include: "{{ tasks }}/virt_instance_create.yml" + - import_tasks: "{{ tasks_path }}/virt_instance_create.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/manual/kernel-qa.yml b/playbooks/manual/kernel-qa.yml index b7b9dae..49766db 100644 --- a/playbooks/manual/kernel-qa.yml +++ b/playbooks/manual/kernel-qa.yml @@ -21,9 +21,9 @@ - hosts tasks: - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/manual/qadevel.yml b/playbooks/manual/qadevel.yml index 6105d36..52d318b 100644 --- a/playbooks/manual/qadevel.yml +++ b/playbooks/manual/qadevel.yml @@ -14,10 +14,10 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - - include: "{{ tasks }}/virt_instance_create.yml" + - import_tasks: "{{ tasks_path }}/virt_instance_create.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: make the box be real hosts: qadevel;qadevel-stg @@ -38,10 +38,10 @@ - sudo tasks: - - include: "{{ tasks }}/hosts.yml" - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - import_tasks: "{{ tasks_path }}/hosts.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/manual/sign-vault.yml b/playbooks/manual/sign-vault.yml index 2c95873..e73a4fa 100644 --- a/playbooks/manual/sign-vault.yml +++ b/playbooks/manual/sign-vault.yml @@ -17,10 +17,10 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - - include: "{{ tasks }}/virt_instance_create.yml" + - import_tasks: "{{ tasks_path }}/virt_instance_create.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: make sign vault server hosts: sign-vault @@ -39,8 +39,8 @@ - sigul/server tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/manual/update-firmware.yml b/playbooks/manual/update-firmware.yml index 9660fba..a065fc1 100644 --- a/playbooks/manual/update-firmware.yml +++ b/playbooks/manual/update-firmware.yml @@ -24,7 +24,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" vars: - updates: diff --git a/playbooks/restart_unbound.yml b/playbooks/restart_unbound.yml index 6c28bf5..782b14e 100644 --- a/playbooks/restart_unbound.yml +++ b/playbooks/restart_unbound.yml @@ -13,4 +13,4 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - - include: "{{ tasks }}/restart_unbound.yml" + - import_tasks: "{{ tasks_path }}/restart_unbound.yml" diff --git a/playbooks/update_ticketkey.yml b/playbooks/update_ticketkey.yml index ee0774b..184c7d0 100644 --- a/playbooks/update_ticketkey.yml +++ b/playbooks/update_ticketkey.yml @@ -8,7 +8,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - name: create new production ticket key @@ -27,7 +27,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: diff --git a/playbooks/vhost_reboot.yml b/playbooks/vhost_reboot.yml index 257ca24..d66a6c7 100644 --- a/playbooks/vhost_reboot.yml +++ b/playbooks/vhost_reboot.yml @@ -116,7 +116,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - - include: "{{ tasks }}/restart_unbound.yml" + - import_tasks: "{{ tasks_path }}/restart_unbound.yml" # - name: get info on guests (postreboot) # virt: command=info