switch all the include tasks to import tasks

playbooks/check-host.yml

@@ -266,4 +266,4 @@
 
 #  handlers:
 #  - import_tasks: "{{ handlers_path }}/restart_services.yml"
-#  - include_tasks: "restart_services.yml"
+#  - import_tasks: "restart_services.yml"

playbooks/cloud_prep.yml

@@ -7,7 +7,7 @@
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
   tasks:
-  - include_tasks: "{{ tasks_path }}/cloud_setup_basic.yml"
+  - import_tasks: "{{ tasks_path }}/cloud_setup_basic.yml"
 
 
   handlers:

playbooks/groups/anitya.yml

@@ -22,9 +22,9 @@
   - openvpn/client
 
   tasks:
-  - include_tasks: "{{ tasks_path }}/yumrepos.yml"
+  - import_tasks: "{{ tasks_path }}/yumrepos.yml"
-  - include_tasks: "{{ tasks_path }}/2fa_client.yml"
+  - import_tasks: "{{ tasks_path }}/2fa_client.yml"
-  - include_tasks: "{{ tasks_path }}/motd.yml"
+  - import_tasks: "{{ tasks_path }}/motd.yml"
 
   handlers:
   - import_tasks: "{{ 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: "{{ tasks_path }}/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: "{{ tasks_path }}/motd.yml"
+  - import_tasks: "{{ tasks_path }}/motd.yml"
 
   handlers:
   - import_tasks: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/ask.yml

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

playbooks/groups/autocloud-backend.yml

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

playbooks/groups/autocloud-web.yml

@@ -11,7 +11,7 @@
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
   pre_tasks:
-  - include_tasks: "{{ tasks_path }}/yumrepos.yml"
+  - import_tasks: "{{ tasks_path }}/yumrepos.yml"
 
   roles:
   - base
@@ -27,8 +27,8 @@
     when: env != "staging"
 
   tasks:
-  - include_tasks: "{{ tasks_path }}/2fa_client.yml"
+  - import_tasks: "{{ tasks_path }}/2fa_client.yml"
-  - include_tasks: "{{ tasks_path }}/motd.yml"
+  - import_tasks: "{{ tasks_path }}/motd.yml"
 
   handlers:
   - import_tasks: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/backup-server.yml

@@ -29,10 +29,10 @@
   - grokmirror_mirror
 
   tasks:
-  - include_tasks: "{{ tasks_path }}/yumrepos.yml"
+  - import_tasks: "{{ tasks_path }}/yumrepos.yml"
-  - include_tasks: "{{ tasks_path }}/2fa_client.yml"
+  - import_tasks: "{{ tasks_path }}/2fa_client.yml"
-  - include_tasks: "{{ tasks_path }}/motd.yml"
+  - import_tasks: "{{ tasks_path }}/motd.yml"
-  - include_tasks: "{{ tasks_path }}/rdiff_backup_server.yml"
+  - import_tasks: "{{ tasks_path }}/rdiff_backup_server.yml"
 
   handlers:
   - import_tasks: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/badges-backend.yml

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

playbooks/groups/badges-web.yml

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

playbooks/groups/basset.yml

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

playbooks/groups/bastion.yml

@@ -23,9 +23,9 @@
   - opendkim
 
   tasks:
-  - include_tasks: "{{ tasks_path }}/yumrepos.yml"
+  - import_tasks: "{{ tasks_path }}/yumrepos.yml"
-  - include_tasks: "{{ tasks_path }}/2fa_client.yml"
+  - import_tasks: "{{ tasks_path }}/2fa_client.yml"
-  - include_tasks: "{{ tasks_path }}/motd.yml"
+  - import_tasks: "{{ tasks_path }}/motd.yml"
 
   handlers:
   - import_tasks: "{{ handlers_path }}/restart_services.yml"

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

playbooks/groups/beaker-virthosts.yml

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

playbooks/groups/beaker.yml

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

playbooks/groups/blockerbugs.yml

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

playbooks/groups/bodhi-backend.yml

@@ -77,9 +77,9 @@
     file: src=/mnt/fedora_koji_prod/koji dest=/mnt/koji/vol/prod state=link
     tags: bodhi
     when: env == 'staging'
-  - include_tasks: "{{ tasks_path }}/2fa_client.yml"
+  - import_tasks: "{{ tasks_path }}/2fa_client.yml"
-  - include_tasks: "{{ tasks_path }}/yumrepos.yml"
+  - import_tasks: "{{ tasks_path }}/yumrepos.yml"
-  - include_tasks: "{{ tasks_path }}/motd.yml"
+  - import_tasks: "{{ tasks_path }}/motd.yml"
 
   handlers:
   - import_tasks: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/bodhi2.yml

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

playbooks/groups/bugyou.yml

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

playbooks/groups/bugzilla2fedmsg.yml

@@ -26,9 +26,9 @@
   - fedmsg/base
 
   tasks:
-  - include_tasks: "{{ tasks_path }}/yumrepos.yml"
+  - import_tasks: "{{ tasks_path }}/yumrepos.yml"
-  - include_tasks: "{{ tasks_path }}/2fa_client.yml"
+  - import_tasks: "{{ tasks_path }}/2fa_client.yml"
-  - include_tasks: "{{ tasks_path }}/motd.yml"
+  - import_tasks: "{{ tasks_path }}/motd.yml"
 
   handlers:
   - import_tasks: "{{ 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: "{{ tasks_path }}/yumrepos.yml"
+  - import_tasks: "{{ tasks_path }}/yumrepos.yml"
-  - include_tasks: "{{ tasks_path }}/osbs_certs.yml"
+  - import_tasks: "{{ tasks_path }}/osbs_certs.yml"
 
   roles:
   - base
@@ -29,9 +29,9 @@
     service: compile
 
   tasks:
-  - include_tasks: "{{ tasks_path }}/2fa_client.yml"
+  - import_tasks: "{{ tasks_path }}/2fa_client.yml"
     when: not inventory_hostname.startswith('bkernel')
-  - include_tasks: "{{ tasks_path }}/motd.yml"
+  - import_tasks: "{{ tasks_path }}/motd.yml"
     when: not inventory_hostname.startswith('bkernel')
 
   - name: make sure kojid is running

playbooks/groups/buildvm.yml

@@ -16,7 +16,7 @@
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
   pre_tasks:
-  - include_tasks: "{{ tasks_path }}/yumrepos.yml"
+  - import_tasks: "{{ tasks_path }}/yumrepos.yml"
 
   roles:
   - base
@@ -42,9 +42,9 @@
     when: env == "staging"
 
   tasks:
-  - include_tasks: "{{ tasks_path }}/2fa_client.yml"
+  - import_tasks: "{{ tasks_path }}/2fa_client.yml"
     when: not inventory_hostname.startswith('bkernel')
-  - include_tasks: "{{ tasks_path }}/motd.yml"
+  - import_tasks: "{{ tasks_path }}/motd.yml"
     when: not inventory_hostname.startswith('bkernel')
 
   - name: make sure kojid is running
@@ -66,8 +66,8 @@
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
   pre_tasks:
-  - include_tasks: "{{ tasks_path }}/osbs_certs.yml"
+  - import_tasks: "{{ tasks_path }}/osbs_certs.yml"
-  - include_tasks: "{{ tasks_path }}/osbs_repos.yml"
+  - import_tasks: "{{ tasks_path }}/osbs_repos.yml"
 
   roles:
   - {

playbooks/groups/busgateway.yml

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

playbooks/groups/certgetter.yml

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

playbooks/groups/ci.yml

@@ -32,9 +32,9 @@
 
   tasks:
   # this is how you include other task lists
-  - include_tasks: "{{ tasks_path }}/yumrepos.yml"
+  - import_tasks: "{{ tasks_path }}/yumrepos.yml"
-  - include_tasks: "{{ tasks_path }}/2fa_client.yml"
+  - import_tasks: "{{ tasks_path }}/2fa_client.yml"
-  - include_tasks: "{{ tasks_path }}/motd.yml"
+  - import_tasks: "{{ tasks_path }}/motd.yml"
 
   handlers:
    - import_tasks: "{{ 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: "{{ tasks_path }}/persistent_cloud.yml"
+  - import_tasks: "{{ tasks_path }}/persistent_cloud.yml"
 
 - name: cloud basic setup
   hosts: copr-back:copr-back-stg
@@ -21,8 +21,8 @@
    - /srv/private/ansible/vars.yml
 
   tasks:
-  - include_tasks: "{{ tasks_path }}/cloud_setup_basic.yml"
+  - import_tasks: "{{ tasks_path }}/cloud_setup_basic.yml"
-  - include_tasks: "{{ tasks_path }}/yumrepos.yml"
+  - import_tasks: "{{ tasks_path }}/yumrepos.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: "{{ tasks_path }}/persistent_cloud.yml"
+  - import_tasks: "{{ tasks_path }}/persistent_cloud.yml"
 
 - name: cloud basic setup
   hosts: copr-dist-git-stg:copr-dist-git
@@ -21,8 +21,8 @@
    - "/srv/private/ansible/vars.yml"
 
   tasks:
-  - include_tasks: "{{ tasks_path }}/cloud_setup_basic.yml"
+  - import_tasks: "{{ tasks_path }}/cloud_setup_basic.yml"
-  - include_tasks: "{{ tasks_path }}/yumrepos.yml"
+  - import_tasks: "{{ tasks_path }}/yumrepos.yml"
   - name: set hostname (required by some services, at least postfix need it)
     hostname: name="{{copr_hostbase}}.cloud.fedoraproject.org"
 
@@ -41,4 +41,4 @@
   - copr/dist_git
 
   handlers:
-  - include_tasks: "../../handlers/restart_services.yml"
+  - import_tasks: "../../handlers/restart_services.yml"

playbooks/groups/copr-frontend.yml

@@ -10,7 +10,7 @@
    - /srv/private/ansible/files/openstack/passwords.yml
 
   tasks:
-  - include_tasks: "{{ tasks_path }}/persistent_cloud.yml"
+  - import_tasks: "{{ tasks_path }}/persistent_cloud.yml"
 
 - name: cloud basic setup
   hosts: copr-front-stg:copr-front
@@ -21,8 +21,8 @@
    - "/srv/private/ansible/vars.yml"
 
   tasks:
-  - include_tasks: "{{ tasks_path }}/cloud_setup_basic.yml"
+  - import_tasks: "{{ tasks_path }}/cloud_setup_basic.yml"
-  - include_tasks: "{{ tasks_path }}/yumrepos.yml"
+  - import_tasks: "{{ tasks_path }}/yumrepos.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: "{{ tasks_path }}/persistent_cloud.yml"
+  - import_tasks: "{{ tasks_path }}/persistent_cloud.yml"
   - name: gather facts
     setup:
     check_mode: no
@@ -29,8 +29,8 @@
    - "/srv/private/ansible/vars.yml"
 
   tasks:
-  - include_tasks: "{{ tasks_path }}/cloud_setup_basic.yml"
+  - import_tasks: "{{ tasks_path }}/cloud_setup_basic.yml"
-  - include_tasks: "{{ tasks_path }}/yumrepos.yml"
+  - import_tasks: "{{ tasks_path }}/yumrepos.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,9 +31,9 @@
   - role: apache
 
   tasks:
-  - include_tasks: "{{ tasks_path }}/yumrepos.yml"
+  - import_tasks: "{{ tasks_path }}/yumrepos.yml"
-  - include_tasks: "{{ tasks_path }}/2fa_client.yml"
+  - import_tasks: "{{ tasks_path }}/2fa_client.yml"
-  - include_tasks: "{{ tasks_path }}/motd.yml"
+  - import_tasks: "{{ tasks_path }}/motd.yml"
 
   handlers:
   - import_tasks: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/darkserver-web.yml

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

playbooks/groups/darkserver.yml

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

playbooks/groups/datagrepper.yml

@@ -27,9 +27,9 @@
   - mod_wsgi
 
   tasks:
-  - include_tasks: "{{ tasks_path }}/yumrepos.yml"
+  - import_tasks: "{{ tasks_path }}/yumrepos.yml"
-  - include_tasks: "{{ tasks_path }}/2fa_client.yml"
+  - import_tasks: "{{ tasks_path }}/2fa_client.yml"
-  - include_tasks: "{{ tasks_path }}/motd.yml"
+  - import_tasks: "{{ tasks_path }}/motd.yml"
 
   handlers:
   - import_tasks: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/dhcp.yml

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

playbooks/groups/dns.yml

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

playbooks/groups/docker-registry.yml

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

playbooks/groups/download.yml

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

playbooks/groups/elections.yml

@@ -24,9 +24,9 @@
   - collectd/base
 
   tasks:
-  - include_tasks: "{{ tasks_path }}/yumrepos.yml"
+  - import_tasks: "{{ tasks_path }}/yumrepos.yml"
-  - include_tasks: "{{ tasks_path }}/2fa_client.yml"
+  - import_tasks: "{{ tasks_path }}/2fa_client.yml"
-  - include_tasks: "{{ tasks_path }}/motd.yml"
+  - import_tasks: "{{ tasks_path }}/motd.yml"
 
   handlers:
   - import_tasks: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/fas.yml

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

playbooks/groups/fas3.yml

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

playbooks/groups/fedimg.yml

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

playbooks/groups/fedocal.yml

@@ -24,9 +24,9 @@
   - collectd/base
 
   tasks:
-  - include_tasks: "{{ tasks_path }}/yumrepos.yml"
+  - import_tasks: "{{ tasks_path }}/yumrepos.yml"
-  - include_tasks: "{{ tasks_path }}/2fa_client.yml"
+  - import_tasks: "{{ tasks_path }}/2fa_client.yml"
-  - include_tasks: "{{ tasks_path }}/motd.yml"
+  - import_tasks: "{{ tasks_path }}/motd.yml"
 
   handlers:
   - import_tasks: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/freshmaker.yml

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

playbooks/groups/github2fedmsg.yml

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

playbooks/groups/gnome-backups.yml

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

playbooks/groups/hotness.yml

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

playbooks/groups/infinote.yml

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

playbooks/groups/ipa.yml

@@ -23,9 +23,9 @@
   - mod_wsgi
 
   tasks:
-  - include_tasks: "{{ tasks_path }}/yumrepos.yml"
+  - import_tasks: "{{ tasks_path }}/yumrepos.yml"
-  - include_tasks: "{{ tasks_path }}/2fa_client.yml"
+  - import_tasks: "{{ tasks_path }}/2fa_client.yml"
-  - include_tasks: "{{ tasks_path }}/motd.yml"
+  - import_tasks: "{{ tasks_path }}/motd.yml"
 
   handlers:
   - import_tasks: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/ipsilon.yml

@@ -40,9 +40,9 @@
     when: env == "production"
 
   tasks:
-  - include_tasks: "{{ tasks_path }}/yumrepos.yml"
+  - import_tasks: "{{ tasks_path }}/yumrepos.yml"
-  - include_tasks: "{{ tasks_path }}/2fa_client.yml"
+  - import_tasks: "{{ tasks_path }}/2fa_client.yml"
-  - include_tasks: "{{ tasks_path }}/motd.yml"
+  - import_tasks: "{{ tasks_path }}/motd.yml"
 
   handlers:
   - import_tasks: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/jenkins-master.yml

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

playbooks/groups/jenkins-slave.yml

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

playbooks/groups/kerneltest.yml

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

playbooks/groups/keyserver.yml

@@ -30,9 +30,9 @@
   - keyserver
 
   tasks:
-  - include_tasks: "{{ tasks_path }}/yumrepos.yml"
+  - import_tasks: "{{ tasks_path }}/yumrepos.yml"
-  - include_tasks: "{{ tasks_path }}/2fa_client.yml"
+  - import_tasks: "{{ tasks_path }}/2fa_client.yml"
-  - include_tasks: "{{ tasks_path }}/motd.yml"
+  - import_tasks: "{{ tasks_path }}/motd.yml"
 
   handlers:
   - import_tasks: "{{ 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: "{{ tasks_path }}/osbs_certs.yml"
+    - import_tasks: "{{ tasks_path }}/osbs_certs.yml"
-    - include_tasks: "{{ tasks_path }}/osbs_repos.yml"
+    - import_tasks: "{{ tasks_path }}/osbs_repos.yml"
 
   roles:
   - base
@@ -82,9 +82,9 @@
     file: src=/mnt/fedora_koji_prod/koji dest=/mnt/koji/vol/prod state=link
     tags: koji_hub
     when: env == 'staging'
-  - include_tasks: "{{ tasks_path }}/yumrepos.yml"
+  - import_tasks: "{{ tasks_path }}/yumrepos.yml"
-  - include_tasks: "{{ tasks_path }}/2fa_client.yml"
+  - import_tasks: "{{ tasks_path }}/2fa_client.yml"
-  - include_tasks: "{{ tasks_path }}/motd.yml"
+  - import_tasks: "{{ tasks_path }}/motd.yml"
 
   handlers:
   - import_tasks: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/kojipkgs.yml

@@ -32,9 +32,9 @@
   - role: varnish
 
   tasks:
-  - include_tasks: "{{ tasks_path }}/yumrepos.yml"
+  - import_tasks: "{{ tasks_path }}/yumrepos.yml"
-  - include_tasks: "{{ tasks_path }}/2fa_client.yml"
+  - import_tasks: "{{ tasks_path }}/2fa_client.yml"
-  - include_tasks: "{{ tasks_path }}/motd.yml"
+  - import_tasks: "{{ tasks_path }}/motd.yml"
 
   handlers:
   - import_tasks: "{{ 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: "{{ tasks_path }}/yumrepos.yml"
+  - import_tasks: "{{ tasks_path }}/yumrepos.yml"
 
   roles:
   - base
@@ -31,8 +31,8 @@
   - fedmsg/base
 
   tasks:
-  - include_tasks: "{{ tasks_path }}/2fa_client.yml"
+  - import_tasks: "{{ tasks_path }}/2fa_client.yml"
-  - include_tasks: "{{ tasks_path }}/motd.yml"
+  - import_tasks: "{{ tasks_path }}/motd.yml"
 
   handlers:
   - import_tasks: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/koschei-web.yml

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

playbooks/groups/logserver.yml

@@ -31,9 +31,9 @@
     when: env == "production"
 
   tasks:
-  - include_tasks: "{{ tasks_path }}/yumrepos.yml"
+  - import_tasks: "{{ tasks_path }}/yumrepos.yml"
-  - include_tasks: "{{ tasks_path }}/2fa_client.yml"
+  - import_tasks: "{{ tasks_path }}/2fa_client.yml"
-  - include_tasks: "{{ tasks_path }}/motd.yml"
+  - import_tasks: "{{ tasks_path }}/motd.yml"
 
 #
 # We exclude some dirs from restorecon on updates on logservers as they are very large

playbooks/groups/loopabull.yml

@@ -12,7 +12,7 @@
    - "/srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml"
 
   pre_tasks:
-  - include_tasks: "{{ tasks_path }}/yumrepos.yml"
+  - import_tasks: "{{ tasks_path }}/yumrepos.yml"
 
   roles:
   - base
@@ -24,8 +24,8 @@
   - sudo
 
   tasks:
-  - include_tasks: "{{ tasks_path }}/2fa_client.yml"
+  - import_tasks: "{{ tasks_path }}/2fa_client.yml"
-  - include_tasks: "{{ tasks_path }}/motd.yml"
+  - import_tasks: "{{ tasks_path }}/motd.yml"
 
   handlers:
   - import_tasks: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/mailman.yml

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

playbooks/groups/maintainer-test.yml

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

playbooks/groups/mariadb-server.yml

@@ -27,9 +27,9 @@
   - sudo
 
   tasks:
-  - include_tasks: "{{ tasks_path }}/yumrepos.yml"
+  - import_tasks: "{{ tasks_path }}/yumrepos.yml"
-  - include_tasks: "{{ tasks_path }}/2fa_client.yml"
+  - import_tasks: "{{ tasks_path }}/2fa_client.yml"
-  - include_tasks: "{{ tasks_path }}/motd.yml"
+  - import_tasks: "{{ tasks_path }}/motd.yml"
 
 # TODO: add iscsi task
 

playbooks/groups/mbs.yml

@@ -11,7 +11,7 @@
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
   pre_tasks:
-  - include_tasks: "{{ tasks_path }}/yumrepos.yml"
+  - import_tasks: "{{ tasks_path }}/yumrepos.yml"
 
   roles:
   - base
@@ -24,8 +24,8 @@
   - collectd/base
 
   tasks:
-  - include_tasks: "{{ tasks_path }}/2fa_client.yml"
+  - import_tasks: "{{ tasks_path }}/2fa_client.yml"
-  - include_tasks: "{{ tasks_path }}/motd.yml"
+  - import_tasks: "{{ tasks_path }}/motd.yml"
 
   handlers:
   - import_tasks: "{{ 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: "{{ tasks_path }}/yumrepos.yml"
+  - import_tasks: "{{ tasks_path }}/yumrepos.yml"
 
   roles:
   - base
@@ -27,8 +27,8 @@
   - { role: mod_wsgi, when: env == "staging" }
 
   tasks:
-  - include_tasks: "{{ tasks_path }}/2fa_client.yml"
+  - import_tasks: "{{ tasks_path }}/2fa_client.yml"
-  - include_tasks: "{{ tasks_path }}/motd.yml"
+  - import_tasks: "{{ tasks_path }}/motd.yml"
 
   handlers:
   - import_tasks: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/memcached.yml

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

playbooks/groups/mirrorlist2.yml

@@ -64,9 +64,9 @@
 
   tasks:
   # this is how you include other task lists
-  - include_tasks: "{{ tasks_path }}/yumrepos.yml"
+  - import_tasks: "{{ tasks_path }}/yumrepos.yml"
-  - include_tasks: "{{ tasks_path }}/2fa_client.yml"
+  - import_tasks: "{{ tasks_path }}/2fa_client.yml"
-  - include_tasks: "{{ tasks_path }}/motd.yml"
+  - import_tasks: "{{ tasks_path }}/motd.yml"
 
 
   handlers:

playbooks/groups/mirrormanager.yml

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

playbooks/groups/modernpaste.yml

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

playbooks/groups/noc.yml

@@ -12,7 +12,7 @@
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
   pre_tasks:
-  - include_tasks: "{{ tasks_path }}/yumrepos.yml"
+  - import_tasks: "{{ tasks_path }}/yumrepos.yml"
 
   roles:
   - base
@@ -41,8 +41,8 @@
    
 
   tasks:
-  - include_tasks: "{{ tasks_path }}/2fa_client.yml"
+  - import_tasks: "{{ tasks_path }}/2fa_client.yml"
-  - include_tasks: "{{ tasks_path }}/motd.yml"
+  - import_tasks: "{{ tasks_path }}/motd.yml"
 
   handlers:
   - import_tasks: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/notifs-backend.yml

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

playbooks/groups/notifs-web.yml

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

playbooks/groups/nuancier.yml

@@ -28,9 +28,9 @@
   - mod_wsgi
 
   tasks:
-  - include_tasks: "{{ tasks_path }}/yumrepos.yml"
+  - import_tasks: "{{ tasks_path }}/yumrepos.yml"
-  - include_tasks: "{{ tasks_path }}/2fa_client.yml"
+  - import_tasks: "{{ tasks_path }}/2fa_client.yml"
-  - include_tasks: "{{ tasks_path }}/motd.yml"
+  - import_tasks: "{{ tasks_path }}/motd.yml"
 
   handlers:
   - import_tasks: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/odcs.yml

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

playbooks/groups/openqa-workers.yml

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

playbooks/groups/openqa.yml

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

playbooks/groups/openstack-compute-nodes.yml

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

playbooks/groups/os-cluster.yml

@@ -42,9 +42,9 @@
         dest:  "/etc/sysconfig/docker-storage-setup"
 
 
-    - include_tasks: "{{ tasks_path }}/yumrepos.yml"
+    - import_tasks: "{{ tasks_path }}/yumrepos.yml"
-    - include_tasks: "{{ tasks_path }}/2fa_client.yml"
+    - import_tasks: "{{ tasks_path }}/2fa_client.yml"
-    - include_tasks: "{{ tasks_path }}/motd.yml"
+    - import_tasks: "{{ tasks_path }}/motd.yml"
 
   handlers:
   - import_tasks: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/osbs-cluster.yml

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

playbooks/groups/osbs-orchestrator-cluster.yml

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

playbooks/groups/packages.yml

@@ -16,7 +16,7 @@
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
   pre_tasks:
-  - include_tasks: "{{ tasks_path }}/yumrepos.yml"
+  - import_tasks: "{{ tasks_path }}/yumrepos.yml"
 
   roles:
   - base
@@ -32,8 +32,8 @@
   - mod_wsgi
 
   tasks:
-  - include_tasks: "{{ tasks_path }}/2fa_client.yml"
+  - import_tasks: "{{ tasks_path }}/2fa_client.yml"
-  - include_tasks: "{{ tasks_path }}/motd.yml"
+  - import_tasks: "{{ tasks_path }}/motd.yml"
 
   handlers:
   - import_tasks: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/pagure.yml

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

playbooks/groups/pdc.yml

@@ -23,9 +23,9 @@
   - sudo
 
   tasks:
-  - include_tasks: "{{ tasks_path }}/yumrepos.yml"
+  - import_tasks: "{{ tasks_path }}/yumrepos.yml"
-  - include_tasks: "{{ tasks_path }}/2fa_client.yml"
+  - import_tasks: "{{ tasks_path }}/2fa_client.yml"
-  - include_tasks: "{{ tasks_path }}/motd.yml"
+  - import_tasks: "{{ tasks_path }}/motd.yml"
 
 - name: stuff for the web nodes
   hosts: pdc-web:pdc-web-stg

playbooks/groups/people.yml

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

playbooks/groups/piwik.yml

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

playbooks/groups/pkgdb.yml

@@ -27,9 +27,9 @@
   - mod_wsgi
 
   tasks:
-  - include_tasks: "{{ tasks_path }}/yumrepos.yml"
+  - import_tasks: "{{ tasks_path }}/yumrepos.yml"
-  - include_tasks: "{{ tasks_path }}/2fa_client.yml"
+  - import_tasks: "{{ tasks_path }}/2fa_client.yml"
-  - include_tasks: "{{ tasks_path }}/motd.yml"
+  - import_tasks: "{{ tasks_path }}/motd.yml"
 
   handlers:
   - import_tasks: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/pkgs.yml

@@ -50,9 +50,9 @@
     tags:
     - krb5
 
-  - include_tasks: "{{ tasks_path }}/yumrepos.yml"
+  - import_tasks: "{{ tasks_path }}/yumrepos.yml"
-  - include_tasks: "{{ tasks_path }}/motd.yml"
+  - import_tasks: "{{ tasks_path }}/motd.yml"
-  - include_tasks: "{{ tasks_path }}/2fa_client.yml"
+  - import_tasks: "{{ tasks_path }}/2fa_client.yml"
 
   handlers:
   - import_tasks: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/postgresql-server-bdr.yml

@@ -29,9 +29,9 @@
   - postgresql_server_bdr
 
   tasks:
-  - include_tasks: "{{ tasks_path }}/yumrepos.yml"
+  - import_tasks: "{{ tasks_path }}/yumrepos.yml"
-  - include_tasks: "{{ tasks_path }}/2fa_client.yml"
+  - import_tasks: "{{ tasks_path }}/2fa_client.yml"
-  - include_tasks: "{{ tasks_path }}/motd.yml"
+  - import_tasks: "{{ tasks_path }}/motd.yml"
 
 # TODO: add iscsi task
 

playbooks/groups/postgresql-server.yml

@@ -17,7 +17,7 @@
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
   pre_tasks:
-  - include_tasks: "{{ tasks_path }}/yumrepos.yml"
+  - import_tasks: "{{ tasks_path }}/yumrepos.yml"
 
   roles:
   - base
@@ -32,8 +32,8 @@
   - { role: openvpn/client, when: inventory_hostname == "db-fas01.phx2.fedoraproject.org" or inventory_hostname == "db01.phx2.fedoraproject.org" }
 
   tasks:
-  - include_tasks: "{{ tasks_path }}/2fa_client.yml"
+  - import_tasks: "{{ tasks_path }}/2fa_client.yml"
-  - include_tasks: "{{ tasks_path }}/motd.yml"
+  - import_tasks: "{{ tasks_path }}/motd.yml"
 
 # TODO: add iscsi task
 

playbooks/groups/proxies.yml

@@ -47,15 +47,15 @@
         state=link
     when: inventory_hostname == 'proxy01.phx2.fedoraproject.org'
 
-  - include_tasks: "{{ tasks_path }}/yumrepos.yml"
+  - import_tasks: "{{ tasks_path }}/yumrepos.yml"
-  - include_tasks: "{{ tasks_path }}/2fa_client.yml"
+  - import_tasks: "{{ tasks_path }}/2fa_client.yml"
-  - include_tasks: "{{ tasks_path }}/motd.yml"
+  - import_tasks: "{{ tasks_path }}/motd.yml"
 
   # You might think we would want these tasks_path on the proxy nodes, but they
   # actually deliver a configuration that our proxy-specific roles below then go
   # and overwrite... so, let's just leave them out.
-  #- include_tasks: "{{ tasks_path }}/apache.yml"
+  #- import_tasks: "{{ tasks_path }}/apache.yml"
-  #- include_tasks: "{{ tasks_path }}/mod_wsgi.yml"
+  #- import_tasks: "{{ tasks_path }}/mod_wsgi.yml"
 
   handlers:
   - import_tasks: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/qa.yml

@@ -28,12 +28,12 @@
    - apache
 
   pre_tasks:
-  - include_tasks: "{{ tasks_path }}/yumrepos.yml"
+  - import_tasks: "{{ tasks_path }}/yumrepos.yml"
 
   tasks:
   # this is how you include other task lists
-  - include_tasks: "{{ tasks_path }}/2fa_client.yml"
+  - import_tasks: "{{ tasks_path }}/2fa_client.yml"
-  - include_tasks: "{{ tasks_path }}/motd.yml"
+  - import_tasks: "{{ tasks_path }}/motd.yml"
 
   handlers:
    - import_tasks: "{{ 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: "{{ tasks_path }}/yumrepos.yml"
+  - import_tasks: "{{ tasks_path }}/yumrepos.yml"
 
   roles:
   - base
@@ -71,8 +71,8 @@
 
   tasks:
   # this is how you include other task lists
-  - include_tasks: "{{ tasks_path }}/2fa_client.yml"
+  - import_tasks: "{{ tasks_path }}/2fa_client.yml"
-  - include_tasks: "{{ tasks_path }}/motd.yml"
+  - import_tasks: "{{ tasks_path }}/motd.yml"
 
   - name: install skopeo for container management
     package:

playbooks/groups/resultsdb-dev.yml

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

playbooks/groups/resultsdb-prod.yml

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

playbooks/groups/resultsdb-stg.yml

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

playbooks/groups/retrace.yml

@@ -20,9 +20,9 @@
   - fedmsg/base
 
   tasks:
-  - include_tasks: "{{ tasks_path }}/2fa_client.yml"
+  - import_tasks: "{{ tasks_path }}/2fa_client.yml"
-  - include_tasks: "{{ tasks_path }}/yumrepos.yml"
+  - import_tasks: "{{ tasks_path }}/yumrepos.yml"
-  - include_tasks: "{{ tasks_path }}/motd.yml"
+  - import_tasks: "{{ tasks_path }}/motd.yml"
 
   handlers:
   - import_tasks: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/secondary.yml

@@ -47,9 +47,9 @@
     - archive.fedoraproject.org
     - archives.fedoraproject.org
   tasks:
-  - include_tasks: "{{ tasks_path }}/yumrepos.yml"
+  - import_tasks: "{{ tasks_path }}/yumrepos.yml"
-  - include_tasks: "{{ tasks_path }}/2fa_client.yml"
+  - import_tasks: "{{ tasks_path }}/2fa_client.yml"
-  - include_tasks: "{{ tasks_path }}/motd.yml"
+  - import_tasks: "{{ tasks_path }}/motd.yml"
 
   - name: Install some misc packages needed for various tasks
     package: name={{ item }} state=present

playbooks/groups/sign-bridge.yml

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

playbooks/groups/smtp-mm.yml

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

playbooks/groups/statscache.yml

@@ -27,9 +27,9 @@
   - sudo
 
   tasks:
-  - include_tasks: "{{ tasks_path }}/yumrepos.yml"
+  - import_tasks: "{{ tasks_path }}/yumrepos.yml"
-  - include_tasks: "{{ tasks_path }}/2fa_client.yml"
+  - import_tasks: "{{ tasks_path }}/2fa_client.yml"
-  - include_tasks: "{{ tasks_path }}/motd.yml"
+  - import_tasks: "{{ tasks_path }}/motd.yml"
 
 - name: Stuff just for the web frontend
   hosts: statscache-web:statscache-web-stg

playbooks/groups/summershum.yml

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