Fix handlers, roles, and tasks to be handlers_path, roles_path and tasks_path so as not to conflict with ansible variables.

Fix duplicate definition of become default that was in group_vars/all as well as vars/global.

playbooks/check-host.yml

@@ -265,5 +265,5 @@
 
 
 #  handlers:
-#  - include: "{{ handlers }}/restart_services.yml"
+#  - include: "{{ handlers_path }}/restart_services.yml"
 #  - include: "restart_services.yml"

playbooks/cloud_prep.yml

@@ -7,8 +7,8 @@
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
   tasks:
-  - include: "{{ tasks }}/cloud_setup_basic.yml"
+  - include: "{{ tasks_path }}/cloud_setup_basic.yml"
 
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/anitya.yml

@@ -22,12 +22,12 @@
   - openvpn/client
 
   tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: set up the frontend bits
   hosts: anitya-frontend
@@ -56,7 +56,7 @@
   - anitya
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: set up the backend bits
   hosts: anitya-backend
@@ -76,4 +76,4 @@
   - anitya
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/arm-qa.yml

@@ -12,7 +12,7 @@
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
   pre_tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
 
   roles:
   - base
@@ -23,7 +23,7 @@
 
   tasks:
   # this is how you include other task lists
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/ask.yml

@@ -26,12 +26,12 @@
       when: env != "staging" }
 
   tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: set up gluster on stg
   hosts: ask-stg

playbooks/groups/autocloud-backend.yml

@@ -11,7 +11,7 @@
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
   pre_tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
 
   roles:
   - base
@@ -24,11 +24,11 @@
   - sudo
 
   tasks:
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: dole out the service-specific config
   hosts: autocloud-backend:autocloud-backend-stg
@@ -39,7 +39,7 @@
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
   roles:
   - redis

playbooks/groups/autocloud-web.yml

@@ -11,7 +11,7 @@
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
   pre_tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
 
   roles:
   - base
@@ -27,11 +27,11 @@
     when: env != "staging"
 
   tasks:
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: dole out the app-specific configuration
   hosts: autocloud-web:autocloud-web-stg
@@ -43,7 +43,7 @@
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
   roles:
   - autocloud/frontend

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"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
+  - include: "{{ tasks_path }}/rdiff_backup_server.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/badges-backend.yml

@@ -28,12 +28,12 @@
        when: env != "staging" }
 
   tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: dole out the service-specific config
   hosts: badges-backend:badges-backend-stg
@@ -52,4 +52,4 @@
    - "{{ vars_path }}/{{ ansible_distribution }}.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/badges-web.yml

@@ -39,9 +39,9 @@
     interval: 10
 
   tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/basset.yml

@@ -30,9 +30,9 @@
   - basset/worker
 
   tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/bastion.yml

@@ -23,12 +23,12 @@
   - opendkim
 
   tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: configure bastion-qa
   hosts: bastion-comm01.qa.fedoraproject.org

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"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/beaker-virthosts.yml

@@ -27,9 +27,9 @@
   - { role: beaker/virthost, tags: ['beakervirthost'] }
 
   tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/beaker.yml

@@ -28,12 +28,12 @@
 
   tasks:
   # this is how you include other task lists
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: configure beaker and required services
   hosts: beaker:beaker-stg
@@ -52,5 +52,5 @@
    - { role: beaker/labcontroller, tags: ['beakerlabcontroller'] }
 
   handlers:
-   - include: "{{ handlers }}/restart_services.yml"
+   - include: "{{ handlers_path }}/restart_services.yml"
 

playbooks/groups/blockerbugs.yml

@@ -26,9 +26,9 @@
   - blockerbugs
 
   tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/bodhi-backend.yml

@@ -74,9 +74,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"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/bodhi2.yml

@@ -41,9 +41,9 @@
   - { role: fedmsg/base,  when: "inventory_hostname.startswith('bodhi0')" }
 
   tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/bugyou.yml

@@ -25,12 +25,12 @@
   - sudo
 
   tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: set up fedmsg basics
   hosts: bugyou:bugyou-stg
@@ -46,7 +46,7 @@
   - fedmsg/base
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: dole out the service-specific config
   hosts: bugyou:bugyou-stg
@@ -66,4 +66,4 @@
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/bugzilla2fedmsg.yml

@@ -26,12 +26,12 @@
   - fedmsg/base
 
   tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: dole out the service-specific config
   hosts: bugzilla2fedmsg:bugzilla2fedmsg-stg
@@ -49,4 +49,4 @@
    - "{{ vars_path }}/{{ ansible_distribution }}.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/buildhw.yml

@@ -13,8 +13,8 @@
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
   pre_tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/osbs_certs.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/osbs_certs.yml"
 
   roles:
   - base
@@ -29,13 +29,13 @@
     service: compile
 
   tasks:
-  - include: "{{ tasks }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
     when: not inventory_hostname.startswith('bkernel')
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/motd.yml"
     when: not inventory_hostname.startswith('bkernel')
 
   - name: make sure kojid is running
     service: name=kojid state=started enabled=yes
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/buildvm.yml

@@ -16,7 +16,7 @@
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
   pre_tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
 
   roles:
   - base
@@ -43,9 +43,9 @@
     when: env == "staging"
 
   tasks:
-  - include: "{{ tasks }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
     when: not inventory_hostname.startswith('bkernel')
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/motd.yml"
     when: not inventory_hostname.startswith('bkernel')
 
   - name: make sure httpd is running
@@ -55,7 +55,7 @@
     service: name=kojid state=started enabled=yes
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: configure osbs on koji builders
   hosts: buildvm:buildvm-stg
@@ -70,8 +70,8 @@
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
   pre_tasks:
-  - include: "{{ tasks }}/osbs_certs.yml"
-  - include: "{{ tasks }}/osbs_repos.yml"
+  - include: "{{ tasks_path }}/osbs_certs.yml"
+  - include: "{{ tasks_path }}/osbs_repos.yml"
 
   roles:
   - {
@@ -140,4 +140,4 @@
     }
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/busgateway.yml

@@ -23,12 +23,12 @@
       when: env != "staging" }
 
   tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: dole out the service-specific config
   hosts: busgateway:busgateway-stg
@@ -55,4 +55,4 @@
    - "{{ vars_path }}/{{ ansible_distribution }}.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/copr-backend.yml

@@ -10,7 +10,7 @@
    - /srv/web/infra/ansible/vars/fedora-cloud.yml
    - /srv/private/ansible/files/openstack/passwords.yml
   tasks:
-  - include: "{{ tasks }}/persistent_cloud.yml"
+  - include: "{{ tasks_path }}/persistent_cloud.yml"
 
 - name: cloud basic setup
   hosts: copr-back:copr-back-stg
@@ -21,7 +21,7 @@
    - /srv/private/ansible/vars.yml
 
   tasks:
-  - include: "{{ tasks }}/cloud_setup_basic.yml"
+  - include: "{{ tasks_path }}/cloud_setup_basic.yml"
 
   - name: set hostname (required by some services, at least postfix need it)
     hostname: name="{{copr_hostbase}}.cloud.fedoraproject.org"

playbooks/groups/copr-dist-git.yml

@@ -10,7 +10,7 @@
    - /srv/private/ansible/files/openstack/passwords.yml
 
   tasks:
-  - include: "{{ tasks }}/persistent_cloud.yml"
+  - include: "{{ tasks_path }}/persistent_cloud.yml"
 
 - name: cloud basic setup
   hosts: copr-dist-git-stg:copr-dist-git
@@ -21,7 +21,7 @@
    - "/srv/private/ansible/vars.yml"
 
   tasks:
-  - include: "{{ tasks }}/cloud_setup_basic.yml"
+  - include: "{{ tasks_path }}/cloud_setup_basic.yml"
   - name: set hostname (required by some services, at least postfix need it)
     hostname: name="{{copr_hostbase}}.cloud.fedoraproject.org"
 

playbooks/groups/copr-frontend.yml

@@ -10,7 +10,7 @@
    - /srv/private/ansible/files/openstack/passwords.yml
 
   tasks:
-  - include: "{{ tasks }}/persistent_cloud.yml"
+  - include: "{{ tasks_path }}/persistent_cloud.yml"
 
 - name: cloud basic setup
   hosts: copr-front-stg:copr-front
@@ -21,7 +21,7 @@
    - "/srv/private/ansible/vars.yml"
 
   tasks:
-  - include: "{{ tasks }}/cloud_setup_basic.yml"
+  - include: "{{ tasks_path }}/cloud_setup_basic.yml"
   - name: set hostname (required by some services, at least postfix need it)
     hostname: name="{{copr_hostbase}}.cloud.fedoraproject.org"
 

playbooks/groups/copr-keygen.yml

@@ -10,7 +10,7 @@
    - /srv/private/ansible/files/openstack/passwords.yml
 
   tasks:
-  - include: "{{ tasks }}/persistent_cloud.yml"
+  - include: "{{ tasks_path }}/persistent_cloud.yml"
   - name: gather facts
     setup:
     check_mode: no
@@ -29,7 +29,7 @@
    - "/srv/private/ansible/vars.yml"
 
   tasks:
-  - include: "{{ tasks }}/cloud_setup_basic.yml"
+  - include: "{{ tasks_path }}/cloud_setup_basic.yml"
   - name: set hostname (required by some services, at least postfix need it)
     hostname: name="{{copr_hostbase}}.cloud.fedoraproject.org"
 

playbooks/groups/darkserver-backend.yml

@@ -31,12 +31,12 @@
   - role: apache
 
   tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: set up fedmsg basics
   hosts: darkserver-backend:darkserver-backend-stg
@@ -52,7 +52,7 @@
   - fedmsg/base
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: dole out the service-specific config
   hosts: darkserver-backend:darkserver-backend-stg
@@ -71,4 +71,4 @@
     process: fedmsg-hub
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/darkserver-web.yml

@@ -31,10 +31,10 @@
   - darkserver/web
 
   tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 

playbooks/groups/darkserver.yml

@@ -32,9 +32,9 @@
   - darkserver
 
   tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/datagrepper.yml

@@ -27,12 +27,12 @@
   - mod_wsgi
 
   tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: dole out the service-specific config
   hosts: datagrepper:datagrepper-stg
@@ -52,7 +52,7 @@
     interval: 15
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
 # The gluster work here can be omitted for now.  It is used by a feature of
 # datagrepper that is partially in place, but not yet functional.
@@ -77,7 +77,7 @@
 #    datadir: /srv/glusterfs/datagrepper
 #
 #  handlers:
-#  - include: "{{ handlers }}/restart_services.yml"
+#  - include: "{{ handlers_path }}/restart_services.yml"
 #
 #- name: set up gluster client on prod
 #  hosts: datagrepper:datagrepper-stg
@@ -102,4 +102,4 @@
 #    mountdir: /var/cache/datagrepper
 #
 #  handlers:
-#  - include: "{{ handlers }}/restart_services.yml"
+#  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/dhcp.yml

@@ -22,9 +22,9 @@
   - tftp_server
 
   tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/dns.yml

@@ -26,9 +26,9 @@
   - dns
 
   tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/docker-registry.yml

@@ -24,12 +24,12 @@
       when: env != "staging" }
 
   tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: set up gluster on stg
   hosts:

playbooks/groups/download.yml

@@ -13,7 +13,7 @@
   tasks:
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
 
 - name: post-initial-steps
@@ -44,9 +44,9 @@
   - { role: openvpn/client, when: datacenter != "phx2" }
 
   tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   - name: put in script for syncing on download-ib01
     copy: src="{{ files }}/download/sync-up-downloads.sh.ib01" dest=/usr/local/bin/sync-up-downloads owner=root group=root mode=755
@@ -68,5 +68,5 @@
 
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 

playbooks/groups/elections.yml

@@ -24,12 +24,12 @@
   - collectd/base
 
   tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: set up fedmsg on elections
   hosts: elections:elections-stg
@@ -45,7 +45,7 @@
   - fedmsg/base
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: deploy elections itself
   hosts: elections:elections-stg
@@ -61,5 +61,5 @@
   - elections
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 

playbooks/groups/fas.yml

@@ -30,9 +30,9 @@
   - { role: openvpn/client, when: env != "staging" }
 
   tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/fas3.yml

@@ -30,9 +30,9 @@
   #- { role: openvpn/client, when: env != "staging" }
 
   tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/fedimg.yml

@@ -28,12 +28,12 @@
   #    when: env != "staging" }
 
   tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: dole out the service-specific config
   hosts: fedimg:fedimg-stg
@@ -61,4 +61,4 @@
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/fedocal.yml

@@ -24,12 +24,12 @@
   - collectd/base
 
   tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: set up fedmsg
   hosts: fedocal-stg:fedocal
@@ -45,7 +45,7 @@
   - fedmsg/base
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: deploy fedocal itself
   hosts: fedocal-stg:fedocal
@@ -61,4 +61,4 @@
   - fedocal
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/github2fedmsg.yml

@@ -29,12 +29,12 @@
   - mod_wsgi
 
   tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: deploy service-specific config
   hosts: github2fedmsg:github2fedmsg-stg
@@ -47,7 +47,7 @@
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
   roles:
   - github2fedmsg

playbooks/groups/gnome-backups.yml

@@ -25,9 +25,9 @@
       nfs_src_dir: 'gnome_backups' }
 
   tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/hosted.yml

@@ -21,9 +21,9 @@
   - openvpn/client
 
   tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/hotness.yml

@@ -32,12 +32,12 @@
   #    when: env != "staging" }
 
   tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: set up fedmsg basics
   hosts: hotness:hotness-stg
@@ -53,7 +53,7 @@
   - fedmsg/base
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: dole out the service-specific config
   hosts: hotness:hotness-stg
@@ -72,4 +72,4 @@
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/infinote.yml

@@ -29,9 +29,9 @@
   - infinote
 
   tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/ipa.yml

@@ -23,12 +23,12 @@
   - mod_wsgi
 
   tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: deploy ipa itself
   hosts: ipa:ipa-stg
@@ -51,7 +51,7 @@
     - combine IPA http keytabs
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
   tasks:
   - name: Combine IPA keytabs
@@ -100,4 +100,4 @@
   - base
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/ipsilon.yml

@@ -40,12 +40,12 @@
     when: env == "production"
 
   tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: deploy ipsilon itself
   hosts: ipsilon:ipsilon-stg
@@ -61,4 +61,4 @@
   - ipsilon
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/jenkins-master.yml

@@ -9,7 +9,7 @@
    - /srv/private/ansible/files/openstack/passwords.yml
 
   tasks:
-  - include: "{{ tasks }}/persistent_cloud.yml"
+  - include: "{{ tasks_path }}/persistent_cloud.yml"
 
 - name: setup all the things
   hosts: jenkins-master
@@ -21,10 +21,10 @@
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
   pre_tasks:
-  - include: "{{ tasks }}/cloud_setup_basic.yml"
+  - include: "{{ tasks_path }}/cloud_setup_basic.yml"
   - name: set hostname (required by some services, at least postfix need it)
     hostname: name="{{inventory_hostname}}"
-  - include: "{{ tasks }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
 
 - name: provision instance
   hosts: jenkins-master
@@ -41,8 +41,8 @@
   - certbot
 
   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"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/jenkins-slave.yml

@@ -9,7 +9,7 @@
    - /srv/private/ansible/files/openstack/passwords.yml
 
   tasks:
-  - include: "{{ tasks }}/persistent_cloud.yml"
+  - include: "{{ tasks_path }}/persistent_cloud.yml"
 
 - name: setup all the things
   hosts: jenkins-slave
@@ -21,10 +21,10 @@
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
   pre_tasks:
-  - include: "{{ tasks }}/cloud_setup_basic.yml"
+  - include: "{{ tasks_path }}/cloud_setup_basic.yml"
   - name: set hostname (required by some services, at least postfix need it)
     hostname: name="{{inventory_hostname}}"
-  - include: "{{ tasks }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
 
 - name: provision instance
   hosts: jenkins-slave
@@ -39,9 +39,9 @@
   - jenkins/slave
 
   tasks:
-# - include: "{{ tasks }}/growroot_cloud.yml"
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/motd.yml"
+# - include: "{{ tasks_path }}/growroot_cloud.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/kerneltest.yml

@@ -29,12 +29,12 @@
   - mod_wsgi
 
   tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: deploy service-specific config
   hosts: kerneltest-stg:kerneltest
@@ -47,7 +47,7 @@
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
   roles:
    - kerneltest

playbooks/groups/keyserver.yml

@@ -29,9 +29,9 @@
   - keyserver
 
   tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

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"
+    - include: "{{ tasks_path }}/osbs_certs.yml"
+    - include: "{{ tasks_path }}/osbs_repos.yml"
 
   roles:
   - base
@@ -82,12 +82,12 @@
     file: src=/mnt/fedora_koji_prod/koji dest=/mnt/koji/vol/prod state=link
     tags: koji_hub
     when: env == 'staging'
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
 
 #- name: Start the kojid builder daemon, but only on staging.

playbooks/groups/kojipkgs.yml

@@ -32,9 +32,9 @@
   - role: varnish
 
   tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/koschei-backend.yml

@@ -11,7 +11,7 @@
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
   pre_tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
 
   roles:
   - base
@@ -31,8 +31,8 @@
   - fedmsg/base
 
   tasks:
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/koschei-web.yml

@@ -24,9 +24,9 @@
   - koschei/frontend
 
   tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/logserver.yml

@@ -31,9 +31,9 @@
     when: env == "production"
 
   tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
 #
 # We exclude some dirs from restorecon on updates on logservers as they are very large
@@ -43,7 +43,7 @@
     copy: src="{{ files }}/logserver/fixfiles_exclude_dirs" dest=/etc/selinux/fixfiles_exclude_dirs owner=root mode=0644
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: Cloud Image stats
   hosts: log01.phx2.fedoraproject.org
@@ -63,4 +63,4 @@
     nfs_src_dir: 'fedora_stats'
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/loopabull.yml

@@ -12,7 +12,7 @@
    - "/srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml"
 
   pre_tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
 
   roles:
   - base
@@ -24,11 +24,11 @@
   - sudo
 
   tasks:
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: Deploy and configure loopabull
   hosts: loopabull-stg

playbooks/groups/mailman.yml

@@ -29,12 +29,12 @@
 
   tasks:
   # this is how you include other task lists
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
 
 #
@@ -119,4 +119,4 @@
     when: inventory_hostname.startswith('mailman01.phx2') or inventory_hostname.startswith('lists-dev')
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/maintainer-test.yml

@@ -9,7 +9,7 @@
    - /srv/private/ansible/files/openstack/passwords.yml
 
   tasks:
-  - include: "{{ tasks }}/persistent_cloud.yml"
+  - include: "{{ tasks_path }}/persistent_cloud.yml"
 
 - name: Do some basic cloud setup on them
   hosts: maintainer-test
@@ -21,7 +21,7 @@
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
   pre_tasks:
-  - include: "{{ tasks }}/cloud_setup_basic.yml"
+  - include: "{{ tasks_path }}/cloud_setup_basic.yml"
   - name: set hostname (required by some services, at least postfix need it)
     hostname: name="{{inventory_hostname}}"
 
@@ -37,7 +37,7 @@
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
   pre_tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
 
   roles:
   - base
@@ -48,7 +48,7 @@
 
   tasks:
   # this is how you include other task lists
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   - name: install packager tools (dnf)
     dnf: state=present pkg={{ item }}
@@ -68,4 +68,4 @@
     - config
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/mariadb-server.yml

@@ -27,11 +27,11 @@
   - sudo
 
   tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
 # TODO: add iscsi task
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/mbs.yml

@@ -11,7 +11,7 @@
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
   pre_tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
 
   roles:
   - base
@@ -24,11 +24,11 @@
   - collectd/base
 
   tasks:
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: openvpn on the prod frontend nodes
   hosts: mbs-frontend
@@ -44,7 +44,7 @@
   - openvpn/client
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: Set up apache on the frontend MBS API app
   hosts: mbs-frontend:mbs-frontend-stg
@@ -60,7 +60,7 @@
   - mod_wsgi
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: set up fedmsg configuration and common mbs files
   hosts: mbs:mbs-stg
@@ -77,7 +77,7 @@
   - mbs/common
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: deploy the frontend MBS API app
   hosts: mbs-frontend:mbs-frontend-stg
@@ -93,7 +93,7 @@
   - mbs/frontend
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: deploy the backend MBS scheduler daemon
   hosts: mbs-backend:mbs-backend-stg
@@ -119,4 +119,4 @@
   #- mbs/backend
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/mdapi.yml

@@ -11,7 +11,7 @@
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
   pre_tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
 
   roles:
   - base
@@ -27,11 +27,11 @@
   - { role: mod_wsgi, when: env == "staging" }
 
   tasks:
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: deploy mdapi itself
   hosts: mdapi-stg:mdapi
@@ -48,7 +48,7 @@
   - { role: plus-plus-service, when: env == "staging" }
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: set up fedmsg
   hosts: mdapi-stg:mdapi
@@ -64,4 +64,4 @@
   - fedmsg/base
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/memcached.yml

@@ -22,9 +22,9 @@
   - memcached
 
   tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/mirrorlist2.yml

@@ -91,10 +91,10 @@
 
   tasks:
   # this is how you include other task lists
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

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"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ 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"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: Deploy the crawler
   hosts: mm-crawler:mm-crawler-stg
@@ -64,7 +64,7 @@
   - { role: openvpn/client, when: datacenter != "phx2" }
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ 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"
+  - include: "{{ 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"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/modernpaste.yml

@@ -27,12 +27,12 @@
   - { role: openvpn/client, when: env != "staging" }
 
   tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: dole out the service-specific config
   hosts: modernpaste-stg:modernpaste
@@ -48,4 +48,4 @@
    - "{{ vars_path }}/{{ ansible_distribution }}.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/nagios-new.yml

@@ -12,7 +12,7 @@
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
   pre_tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
 
   roles:
   - base
@@ -32,11 +32,11 @@
     host: "nagios{{env_suffix}}.fedoraproject.org"
 
   tasks:
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: deploy nagios service config
   hosts: nagios-new
@@ -50,7 +50,7 @@
    - "/srv/web/infra/ansible/vars/nagios.{{ inventory_hostname_short }}.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
   roles:
   - nagios_server

playbooks/groups/noc.yml

@@ -30,12 +30,12 @@
     when: env == "production"
 
   tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: deploy service-specific config (just for production)
   hosts: nagios
@@ -49,7 +49,7 @@
    - "/srv/web/infra/ansible/vars/nagios.{{ inventory_hostname_short }}.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
   roles:
   - { role: dhcp_server, when: datacenter == 'phx2' }

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"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: dole out the service-specific config
   hosts: notifs-backend:notifs-backend-stg
@@ -66,4 +66,4 @@
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/notifs-web.yml

@@ -30,9 +30,9 @@
       when: env != "staging" }
 
   tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/nuancier.yml

@@ -28,12 +28,12 @@
   - mod_wsgi
 
   tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: set up fedmsg
   hosts: nuancier:nuancier-stg
@@ -49,7 +49,7 @@
   - fedmsg/base
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: set up gluster on stg
   hosts: nuancier-stg
@@ -125,4 +125,4 @@
   - nuancier
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/openqa-workers.yml

@@ -20,9 +20,9 @@
    - apache
 
   tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-   - include: "{{ handlers }}/restart_services.yml"
+   - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/openqa.yml

@@ -23,12 +23,12 @@
    - apache
 
   tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-   - include: "{{ handlers }}/restart_services.yml"
+   - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: configure openQA
   hosts: openqa:openqa-stg
@@ -54,7 +54,7 @@
    - { role: autocloudreporter, tags: ['autocloudreporter'] }
 
   handlers:
-   - include: "{{ handlers }}/restart_services.yml"
+   - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: set up openQA server data NFS mounts (staging)
   hosts: openqa-stg
@@ -77,7 +77,7 @@
     tags: ['nfs_client']
 
   handlers:
-   - include: "{{ handlers }}/restart_services.yml"
+   - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: set up openQA server data NFS mounts (prod)
   hosts: openqa
@@ -100,4 +100,4 @@
     tags: ['nfs_client']
 
   handlers:
-   - include: "{{ handlers }}/restart_services.yml"
+   - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/openstack-compute-nodes.yml

@@ -21,9 +21,9 @@
   - cloud_compute
 
   tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/osbs-cluster.yml

@@ -23,12 +23,12 @@
     - sudo
 
   tasks:
-    - include: "{{ tasks }}/yumrepos.yml"
-    - include: "{{ tasks }}/2fa_client.yml"
-    - include: "{{ tasks }}/motd.yml"
+    - include: "{{ tasks_path }}/yumrepos.yml"
+    - include: "{{ tasks_path }}/2fa_client.yml"
+    - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: OSBS control hosts pre-req setup
   hosts: osbs-control:osbs-control-stg

playbooks/groups/packages.yml

@@ -29,12 +29,12 @@
   - mod_wsgi
 
   tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: set up gluster server on prod
   hosts: packages
@@ -56,7 +56,7 @@
     datadir: /srv/glusterfs/packages
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: set up gluster client on prod
   hosts: packages
@@ -82,7 +82,7 @@
     mountdir: /var/cache/fedoracommunity
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: dole out the new service specific config
   hosts: packages:packages-stg
@@ -101,4 +101,4 @@
     process: fedmsg-hub
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/pagure.yml

@@ -22,12 +22,12 @@
   - postgresql_server
 
   tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: deploy pagure itself
   hosts: pagure:pagure-stg
@@ -56,4 +56,4 @@
   - pagure/fedmsg
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/paste.yml

@@ -25,9 +25,9 @@
       when: env != "staging" }
 
   tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/pdc.yml

@@ -11,7 +11,7 @@
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
   roles:
   - base
@@ -23,9 +23,9 @@
   - sudo
 
   tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
 - name: stuff for the web nodes
   hosts: pdc-web:pdc-web-stg
@@ -36,7 +36,7 @@
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
   roles:
   - role: openvpn/client
@@ -54,7 +54,7 @@
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
   roles:
   - fedmsg/base

playbooks/groups/people.yml

@@ -81,9 +81,9 @@
   - people
 
   tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/piwik.yml

@@ -25,9 +25,9 @@
   - sudo
 
   tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/pkgdb.yml

@@ -27,12 +27,12 @@
   - mod_wsgi
 
   tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: set up fedmsg on pkgdb
   hosts: pkgdb-stg:pkgdb
@@ -48,7 +48,7 @@
   - fedmsg/base
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: deploy pkgdb itself
   hosts: pkgdb-stg:pkgdb
@@ -64,4 +64,4 @@
   - pkgdb2
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/pkgs.yml

@@ -44,12 +44,12 @@
   - { role: distgit/pagure, when: env == "staging" and inventory_hostname.startswith('pkgs01') }
 
   tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/motd.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/motd.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: setup fedmsg on pkgs
   hosts: pkgs-stg:pkgs02.phx2.fedoraproject.org
@@ -67,4 +67,4 @@
   - fedmsg/hub
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/postgresql-server-bdr.yml

@@ -29,11 +29,11 @@
   - postgresql_server_bdr
 
   tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
 # TODO: add iscsi task
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/postgresql-server.yml

@@ -29,11 +29,11 @@
   - { role: openvpn/client, when: inventory_hostname == "db-fas01.phx2.fedoraproject.org" or inventory_hostname == "db01.phx2.fedoraproject.org" }
 
   tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
 # TODO: add iscsi task
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/proxies.yml

@@ -46,18 +46,18 @@
         state=link
     when: inventory_hostname == 'proxy01.phx2.fedoraproject.org'
 
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
-  # You might think we would want these tasks on the proxy nodes, but they
+  # You might think we would want these tasks_path on the proxy nodes, but they
   # actually deliver a configuration that our proxy-specific roles below then go
   # and overwrite... so, let's just leave them out.
-  #- include: "{{ tasks }}/apache.yml"
-  #- include: "{{ tasks }}/mod_wsgi.yml"
+  #- include: "{{ tasks_path }}/apache.yml"
+  #- include: "{{ tasks_path }}/mod_wsgi.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
 
   # TODO
@@ -89,7 +89,7 @@
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
   pre_tasks:
   #
@@ -179,7 +179,7 @@
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
   pre_tasks:
   #

playbooks/groups/qa.yml

@@ -28,15 +28,15 @@
    - apache
 
   pre_tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
 
   tasks:
   # this is how you include other task lists
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-   - include: "{{ handlers }}/restart_services.yml"
+   - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: configure phabricator
   hosts: qa-prod:qa-stg
@@ -54,7 +54,7 @@
    - { role: phabricator, tags: ['phabricator'] }
 
   handlers:
-   - include: "{{ handlers }}/restart_services.yml"
+   - include: "{{ handlers_path }}/restart_services.yml"
 
 
 - name: configure qa uildbot CI
@@ -74,7 +74,7 @@
    - { role: taskotron/buildslave-configure, tags: ['buildslaveconfig'] }
 
   handlers:
-   - include: "{{ handlers }}/restart_services.yml"
+   - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: configure static sites for qa-stg
   hosts: qa-prod:qa-stg
@@ -113,6 +113,6 @@
        when: deployment_type != "qa-stg", tags: ['imagefactoryclient'] }
 
   handlers:
-     - include: "{{ handlers }}/restart_services.yml"
+     - include: "{{ handlers_path }}/restart_services.yml"
 
 

playbooks/groups/releng-compose.yml

@@ -18,7 +18,7 @@
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
   pre_tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
 
   roles:
   - base
@@ -67,8 +67,8 @@
 
   tasks:
   # this is how you include other task lists
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/resultsdb-dev.yml

@@ -28,12 +28,12 @@
 
   tasks:
   # this is how you include other task lists
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-   - include: "{{ handlers }}/restart_services.yml"
+   - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: configure resultsdb and execdb
   hosts: resultsdb-dev
@@ -51,5 +51,5 @@
    - { role: taskotron/execdb, tags: ['execdb'] }
 
   handlers:
-   - include: "{{ handlers }}/restart_services.yml"
+   - include: "{{ handlers_path }}/restart_services.yml"
 

playbooks/groups/resultsdb-prod.yml

@@ -29,12 +29,12 @@
 
   tasks:
   # this is how you include other task lists
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-   - include: "{{ handlers }}/restart_services.yml"
+   - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: configure resultsdb production
   hosts: resultsdb-prod
@@ -53,5 +53,5 @@
    - { role: taskotron/execdb, tags: ['execdb'] }
 
   handlers:
-   - include: "{{ handlers }}/restart_services.yml"
+   - include: "{{ handlers_path }}/restart_services.yml"
 

playbooks/groups/resultsdb-stg.yml

@@ -28,12 +28,12 @@
 
   tasks:
   # this is how you include other task lists
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-   - include: "{{ handlers }}/restart_services.yml"
+   - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: configure resultsdb
   hosts: resultsdb-stg
@@ -52,5 +52,5 @@
    - { role: taskotron/execdb, tags: ['execdb'] }
 
   handlers:
-   - include: "{{ handlers }}/restart_services.yml"
+   - include: "{{ handlers_path }}/restart_services.yml"
 

playbooks/groups/retrace.yml

@@ -20,12 +20,12 @@
   - fedmsg/base
 
   tasks:
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: setup FAF server
   hosts: retrace:faf-stg

playbooks/groups/secondary.yml

@@ -47,9 +47,9 @@
     - archive.fedoraproject.org
     - archives.fedoraproject.org
   tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   - name: Install some misc packages needed for various tasks
     yum: pkg={{ item }} state=present
@@ -71,4 +71,4 @@
         cron_file=update-fullfiletimelist
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/sign-bridge.yml

@@ -31,9 +31,9 @@
     owner_group: sigul
 
   tasks:
-  - include: "{{ tasks }}/motd.yml"
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

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"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/statscache.yml

@@ -14,7 +14,7 @@
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
   roles:
   - base
@@ -27,9 +27,9 @@
   - sudo
 
   tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
 - name: Stuff just for the web frontend
   hosts: statscache-web:statscache-web-stg
@@ -40,7 +40,7 @@
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
   roles:
   - mod_wsgi
@@ -57,7 +57,7 @@
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
   roles:
   - fedmsg/hub

playbooks/groups/summershum.yml

@@ -29,12 +29,12 @@
   #    when: env != "staging" }
 
   tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: set up fedmsg basics
   hosts: summershum:summershum-stg
@@ -50,7 +50,7 @@
   - fedmsg/base
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: dole out the service-specific config
   hosts: summershum:summershum-stg
@@ -69,4 +69,4 @@
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/sundries.yml

@@ -53,9 +53,9 @@
     when: master_sundries_node
 
   tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/tagger.yml

@@ -29,12 +29,12 @@
   - mod_wsgi
 
   tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: dole out the service specific config
   hosts: tagger:tagger-stg
@@ -50,7 +50,7 @@
   - tagger
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
 # This comes last because it relies on a group created by the tagger role.
 - name: setup fedmsg
@@ -67,4 +67,4 @@
   - fedmsg/base
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/taskotron-client-hosts.yml

@@ -26,12 +26,12 @@
   - { role: openvpn/client, when: datacenter != "phx2" }
 
   tasks:
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks_path }}/yumrepos.yml"
+  - include: "{{ tasks_path }}/2fa_client.yml"
+  - include: "{{ tasks_path }}/motd.yml"
 
   handlers:
-  - include: "{{ handlers }}/restart_services.yml"
+  - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: configure taskotron imagefactory
   hosts: qa11.qa.fedoraproject.org:qa12.qa.fedoraproject.org
@@ -47,7 +47,7 @@
    - { role: taskotron/imagefactory, tags: ['taskotronimagefactory'] }
 
   handlers:
-   - include: "{{ handlers }}/restart_services.yml"
+   - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: configure taskotron client host
   hosts: taskotron-dev-client-hosts:taskotron-stg-client-hosts:taskotron-prod-client-hosts
@@ -66,6 +66,6 @@
    - { role: taskotron/buildslave-configure, tags: ['buildslaveconfigure'] }
 
   handlers:
-   - include: "{{ handlers }}/restart_services.yml"
+   - include: "{{ handlers_path }}/restart_services.yml"