diff --git a/playbooks/check-host.yml b/playbooks/check-host.yml index cc1e6003ca..33bff7b99e 100644 --- a/playbooks/check-host.yml +++ b/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" diff --git a/playbooks/cloud_prep.yml b/playbooks/cloud_prep.yml index fb5524f36d..3cb6f6c08e 100644 --- a/playbooks/cloud_prep.yml +++ b/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: diff --git a/playbooks/groups/anitya.yml b/playbooks/groups/anitya.yml index 0140188758..d30a2f33d4 100644 --- a/playbooks/groups/anitya.yml +++ b/playbooks/groups/anitya.yml @@ -22,9 +22,9 @@ - openvpn/client tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/arm-qa.yml b/playbooks/groups/arm-qa.yml index 9a7482ee6e..9d69482de5 100644 --- a/playbooks/groups/arm-qa.yml +++ b/playbooks/groups/arm-qa.yml @@ -12,7 +12,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include_tasks: "{{ 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" diff --git a/playbooks/groups/ask.yml b/playbooks/groups/ask.yml index a211065a59..d5cdd3c5e1 100644 --- a/playbooks/groups/ask.yml +++ b/playbooks/groups/ask.yml @@ -26,9 +26,9 @@ when: env != "staging" } tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/autocloud-backend.yml b/playbooks/groups/autocloud-backend.yml index 62732d4a4b..669ab215d6 100644 --- a/playbooks/groups/autocloud-backend.yml +++ b/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" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/autocloud-web.yml b/playbooks/groups/autocloud-web.yml index aeb3af5bfe..a4a2bf18c8 100644 --- a/playbooks/groups/autocloud-web.yml +++ b/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" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/backup-server.yml b/playbooks/groups/backup-server.yml index 1c23bf0b55..43927f54dc 100644 --- a/playbooks/groups/backup-server.yml +++ b/playbooks/groups/backup-server.yml @@ -29,10 +29,10 @@ - grokmirror_mirror tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" - - include_tasks: "{{ tasks_path }}/rdiff_backup_server.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/rdiff_backup_server.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/badges-backend.yml b/playbooks/groups/badges-backend.yml index 6679c85cf0..466c056e78 100644 --- a/playbooks/groups/badges-backend.yml +++ b/playbooks/groups/badges-backend.yml @@ -28,9 +28,9 @@ when: env != "staging" } tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/badges-web.yml b/playbooks/groups/badges-web.yml index 59fc5ab569..211a768d59 100644 --- a/playbooks/groups/badges-web.yml +++ b/playbooks/groups/badges-web.yml @@ -39,9 +39,9 @@ interval: 10 tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/basset.yml b/playbooks/groups/basset.yml index 6803be0c53..fc3d701bcf 100644 --- a/playbooks/groups/basset.yml +++ b/playbooks/groups/basset.yml @@ -30,9 +30,9 @@ - basset/worker tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/bastion.yml b/playbooks/groups/bastion.yml index b4fbc87820..41a4054c35 100644 --- a/playbooks/groups/bastion.yml +++ b/playbooks/groups/bastion.yml @@ -23,9 +23,9 @@ - opendkim tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/batcave.yml b/playbooks/groups/batcave.yml index a0382fad87..cc8a912956 100644 --- a/playbooks/groups/batcave.yml +++ b/playbooks/groups/batcave.yml @@ -34,9 +34,9 @@ - { role: nfs/client, mnt_dir: '/mnt/fedora/app', nfs_src_dir: 'fedora_app/app' } tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/beaker-virthosts.yml b/playbooks/groups/beaker-virthosts.yml index 9937a7ad26..084c7b368d 100644 --- a/playbooks/groups/beaker-virthosts.yml +++ b/playbooks/groups/beaker-virthosts.yml @@ -27,9 +27,9 @@ - { role: beaker/virthost, tags: ['beakervirthost'] } tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/beaker.yml b/playbooks/groups/beaker.yml index 5f60db32d0..81e011ed49 100644 --- a/playbooks/groups/beaker.yml +++ b/playbooks/groups/beaker.yml @@ -28,9 +28,9 @@ tasks: # this is how you include other task lists - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/blockerbugs.yml b/playbooks/groups/blockerbugs.yml index 33432ca8c0..a8a44d1d59 100644 --- a/playbooks/groups/blockerbugs.yml +++ b/playbooks/groups/blockerbugs.yml @@ -26,9 +26,9 @@ - blockerbugs tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/bodhi-backend.yml b/playbooks/groups/bodhi-backend.yml index 32f5858635..4d9ad786e3 100644 --- a/playbooks/groups/bodhi-backend.yml +++ b/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" - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/bodhi2.yml b/playbooks/groups/bodhi2.yml index fd29a1511d..74d66f99d6 100644 --- a/playbooks/groups/bodhi2.yml +++ b/playbooks/groups/bodhi2.yml @@ -41,9 +41,9 @@ when: env == "staging" tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/bugyou.yml b/playbooks/groups/bugyou.yml index ceb7744717..a542afb151 100644 --- a/playbooks/groups/bugyou.yml +++ b/playbooks/groups/bugyou.yml @@ -25,9 +25,9 @@ - sudo tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/bugzilla2fedmsg.yml b/playbooks/groups/bugzilla2fedmsg.yml index d870df2706..5e9a9bd20f 100644 --- a/playbooks/groups/bugzilla2fedmsg.yml +++ b/playbooks/groups/bugzilla2fedmsg.yml @@ -26,9 +26,9 @@ - fedmsg/base tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/buildhw.yml b/playbooks/groups/buildhw.yml index 2c2a75c552..6c5dd2fd58 100644 --- a/playbooks/groups/buildhw.yml +++ b/playbooks/groups/buildhw.yml @@ -13,8 +13,8 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/osbs_certs.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.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 diff --git a/playbooks/groups/buildvm.yml b/playbooks/groups/buildvm.yml index ac68a86cb8..127e8bffea 100644 --- a/playbooks/groups/buildvm.yml +++ b/playbooks/groups/buildvm.yml @@ -16,7 +16,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include_tasks: "{{ 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" - - include_tasks: "{{ tasks_path }}/osbs_repos.yml" + - import_tasks: "{{ tasks_path }}/osbs_certs.yml" + - import_tasks: "{{ tasks_path }}/osbs_repos.yml" roles: - { diff --git a/playbooks/groups/busgateway.yml b/playbooks/groups/busgateway.yml index cd6602d22d..5b74416abe 100644 --- a/playbooks/groups/busgateway.yml +++ b/playbooks/groups/busgateway.yml @@ -23,9 +23,9 @@ when: env != "staging" } tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/certgetter.yml b/playbooks/groups/certgetter.yml index 81526711ed..65c2e97a70 100644 --- a/playbooks/groups/certgetter.yml +++ b/playbooks/groups/certgetter.yml @@ -22,9 +22,9 @@ when: env != "staging" } tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/ci.yml b/playbooks/groups/ci.yml index 1b316d654f..a97fd02847 100644 --- a/playbooks/groups/ci.yml +++ b/playbooks/groups/ci.yml @@ -32,9 +32,9 @@ tasks: # this is how you include other task lists - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/copr-backend.yml b/playbooks/groups/copr-backend.yml index ede88a423c..67fe7d8772 100644 --- a/playbooks/groups/copr-backend.yml +++ b/playbooks/groups/copr-backend.yml @@ -10,7 +10,7 @@ - /srv/web/infra/ansible/vars/fedora-cloud.yml - /srv/private/ansible/files/openstack/passwords.yml tasks: - - include_tasks: "{{ 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" - - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/cloud_setup_basic.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" diff --git a/playbooks/groups/copr-dist-git.yml b/playbooks/groups/copr-dist-git.yml index 16bc8fe137..48a8fe844c 100644 --- a/playbooks/groups/copr-dist-git.yml +++ b/playbooks/groups/copr-dist-git.yml @@ -10,7 +10,7 @@ - /srv/private/ansible/files/openstack/passwords.yml tasks: - - include_tasks: "{{ 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" - - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/cloud_setup_basic.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" diff --git a/playbooks/groups/copr-frontend.yml b/playbooks/groups/copr-frontend.yml index f56a07d648..42c951c1f5 100644 --- a/playbooks/groups/copr-frontend.yml +++ b/playbooks/groups/copr-frontend.yml @@ -10,7 +10,7 @@ - /srv/private/ansible/files/openstack/passwords.yml tasks: - - include_tasks: "{{ 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" - - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/cloud_setup_basic.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" diff --git a/playbooks/groups/copr-keygen.yml b/playbooks/groups/copr-keygen.yml index a2f318898c..f2e870bf42 100644 --- a/playbooks/groups/copr-keygen.yml +++ b/playbooks/groups/copr-keygen.yml @@ -10,7 +10,7 @@ - /srv/private/ansible/files/openstack/passwords.yml tasks: - - include_tasks: "{{ 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" - - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/cloud_setup_basic.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" diff --git a/playbooks/groups/darkserver-backend.yml b/playbooks/groups/darkserver-backend.yml index 7d03e26bb0..8b29d86d58 100644 --- a/playbooks/groups/darkserver-backend.yml +++ b/playbooks/groups/darkserver-backend.yml @@ -31,9 +31,9 @@ - role: apache tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/darkserver-web.yml b/playbooks/groups/darkserver-web.yml index bbbfd1884d..42d491014c 100644 --- a/playbooks/groups/darkserver-web.yml +++ b/playbooks/groups/darkserver-web.yml @@ -31,9 +31,9 @@ - darkserver/web tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/darkserver.yml b/playbooks/groups/darkserver.yml index 7fe25fba4f..9a6b6161d4 100644 --- a/playbooks/groups/darkserver.yml +++ b/playbooks/groups/darkserver.yml @@ -32,9 +32,9 @@ - darkserver tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/datagrepper.yml b/playbooks/groups/datagrepper.yml index 1276309621..182382819f 100644 --- a/playbooks/groups/datagrepper.yml +++ b/playbooks/groups/datagrepper.yml @@ -27,9 +27,9 @@ - mod_wsgi tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/dhcp.yml b/playbooks/groups/dhcp.yml index 2a8bf11179..becc4545ea 100644 --- a/playbooks/groups/dhcp.yml +++ b/playbooks/groups/dhcp.yml @@ -22,9 +22,9 @@ - tftp_server tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/dns.yml b/playbooks/groups/dns.yml index 61614a2cad..0ef01aa9e9 100644 --- a/playbooks/groups/dns.yml +++ b/playbooks/groups/dns.yml @@ -26,9 +26,9 @@ - dns tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/docker-registry.yml b/playbooks/groups/docker-registry.yml index cae459fa01..342a3f212c 100644 --- a/playbooks/groups/docker-registry.yml +++ b/playbooks/groups/docker-registry.yml @@ -24,9 +24,9 @@ when: env != "staging" } tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/download.yml b/playbooks/groups/download.yml index 6fb66bdd66..c194b6c265 100644 --- a/playbooks/groups/download.yml +++ b/playbooks/groups/download.yml @@ -44,9 +44,9 @@ - { role: openvpn/client, when: datacenter != "phx2" } tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.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 diff --git a/playbooks/groups/elections.yml b/playbooks/groups/elections.yml index 920a3de902..83a91dc671 100644 --- a/playbooks/groups/elections.yml +++ b/playbooks/groups/elections.yml @@ -24,9 +24,9 @@ - collectd/base tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/fas.yml b/playbooks/groups/fas.yml index d237353a4b..99d63f0d30 100644 --- a/playbooks/groups/fas.yml +++ b/playbooks/groups/fas.yml @@ -30,9 +30,9 @@ - { role: openvpn/client, when: env != "staging" } tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/fas3.yml b/playbooks/groups/fas3.yml index 1eda1f5032..f8604e25a3 100644 --- a/playbooks/groups/fas3.yml +++ b/playbooks/groups/fas3.yml @@ -30,9 +30,9 @@ #- { role: openvpn/client, when: env != "staging" } tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/fedimg.yml b/playbooks/groups/fedimg.yml index e37b7310ec..d42910fe7f 100644 --- a/playbooks/groups/fedimg.yml +++ b/playbooks/groups/fedimg.yml @@ -28,9 +28,9 @@ # when: env != "staging" } tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/fedocal.yml b/playbooks/groups/fedocal.yml index 9e23b808b1..aa863fd74b 100644 --- a/playbooks/groups/fedocal.yml +++ b/playbooks/groups/fedocal.yml @@ -24,9 +24,9 @@ - collectd/base tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/freshmaker.yml b/playbooks/groups/freshmaker.yml index f718068b89..37677c14f8 100644 --- a/playbooks/groups/freshmaker.yml +++ b/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" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/github2fedmsg.yml b/playbooks/groups/github2fedmsg.yml index 130f5a8b9f..26b8d49244 100644 --- a/playbooks/groups/github2fedmsg.yml +++ b/playbooks/groups/github2fedmsg.yml @@ -29,9 +29,9 @@ - mod_wsgi tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/gnome-backups.yml b/playbooks/groups/gnome-backups.yml index 83452d84ce..3c456ccb9b 100644 --- a/playbooks/groups/gnome-backups.yml +++ b/playbooks/groups/gnome-backups.yml @@ -25,9 +25,9 @@ nfs_src_dir: 'gnome_backups' } tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/hotness.yml b/playbooks/groups/hotness.yml index 09244b609b..5920d46a1b 100644 --- a/playbooks/groups/hotness.yml +++ b/playbooks/groups/hotness.yml @@ -32,9 +32,9 @@ # when: env != "staging" } tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/infinote.yml b/playbooks/groups/infinote.yml index 8de69ca80d..72928a8f28 100644 --- a/playbooks/groups/infinote.yml +++ b/playbooks/groups/infinote.yml @@ -29,9 +29,9 @@ - infinote tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/ipa.yml b/playbooks/groups/ipa.yml index cc3f357e9c..32daf27f52 100644 --- a/playbooks/groups/ipa.yml +++ b/playbooks/groups/ipa.yml @@ -23,9 +23,9 @@ - mod_wsgi tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/ipsilon.yml b/playbooks/groups/ipsilon.yml index 62f33cbd2b..5f83f66d91 100644 --- a/playbooks/groups/ipsilon.yml +++ b/playbooks/groups/ipsilon.yml @@ -40,9 +40,9 @@ when: env == "production" tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/jenkins-master.yml b/playbooks/groups/jenkins-master.yml index 5e9173be8d..52c37644dc 100644 --- a/playbooks/groups/jenkins-master.yml +++ b/playbooks/groups/jenkins-master.yml @@ -9,7 +9,7 @@ - /srv/private/ansible/files/openstack/passwords.yml tasks: - - include_tasks: "{{ 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" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/jenkins-slave.yml b/playbooks/groups/jenkins-slave.yml index 7e559f6b23..79585a7976 100644 --- a/playbooks/groups/jenkins-slave.yml +++ b/playbooks/groups/jenkins-slave.yml @@ -9,7 +9,7 @@ - /srv/private/ansible/files/openstack/passwords.yml tasks: - - include_tasks: "{{ 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" - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" +# - import_tasks: "{{ tasks_path }}/growroot_cloud.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/kerneltest.yml b/playbooks/groups/kerneltest.yml index b88849d0e2..40872cf4c7 100644 --- a/playbooks/groups/kerneltest.yml +++ b/playbooks/groups/kerneltest.yml @@ -29,9 +29,9 @@ - mod_wsgi tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/keyserver.yml b/playbooks/groups/keyserver.yml index 57b1795224..2f5ccb4b48 100644 --- a/playbooks/groups/keyserver.yml +++ b/playbooks/groups/keyserver.yml @@ -30,9 +30,9 @@ - keyserver tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/koji-hub.yml b/playbooks/groups/koji-hub.yml index b8ce8b6ad9..a0929cc64c 100644 --- a/playbooks/groups/koji-hub.yml +++ b/playbooks/groups/koji-hub.yml @@ -17,8 +17,8 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include_tasks: "{{ tasks_path }}/osbs_certs.yml" - - include_tasks: "{{ tasks_path }}/osbs_repos.yml" + - import_tasks: "{{ tasks_path }}/osbs_certs.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" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/kojipkgs.yml b/playbooks/groups/kojipkgs.yml index d3aa40f248..4d68cc494f 100644 --- a/playbooks/groups/kojipkgs.yml +++ b/playbooks/groups/kojipkgs.yml @@ -32,9 +32,9 @@ - role: varnish tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/koschei-backend.yml b/playbooks/groups/koschei-backend.yml index d0e3af26f8..73c27f85b3 100644 --- a/playbooks/groups/koschei-backend.yml +++ b/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" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/koschei-web.yml b/playbooks/groups/koschei-web.yml index 20ff01fdc2..1ede9ab3b3 100644 --- a/playbooks/groups/koschei-web.yml +++ b/playbooks/groups/koschei-web.yml @@ -24,9 +24,9 @@ - koschei/frontend tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/logserver.yml b/playbooks/groups/logserver.yml index 54c27b8a72..16026b527f 100644 --- a/playbooks/groups/logserver.yml +++ b/playbooks/groups/logserver.yml @@ -31,9 +31,9 @@ when: env == "production" tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" # # We exclude some dirs from restorecon on updates on logservers as they are very large diff --git a/playbooks/groups/loopabull.yml b/playbooks/groups/loopabull.yml index bc385be661..a90efcab56 100644 --- a/playbooks/groups/loopabull.yml +++ b/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" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/mailman.yml b/playbooks/groups/mailman.yml index 1c2ac1be88..f3a56c2121 100644 --- a/playbooks/groups/mailman.yml +++ b/playbooks/groups/mailman.yml @@ -29,9 +29,9 @@ tasks: # this is how you include other task lists - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/maintainer-test.yml b/playbooks/groups/maintainer-test.yml index d18305c644..bb5b0cf64f 100644 --- a/playbooks/groups/maintainer-test.yml +++ b/playbooks/groups/maintainer-test.yml @@ -9,7 +9,7 @@ - /srv/private/ansible/files/openstack/passwords.yml tasks: - - include_tasks: "{{ 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 }} diff --git a/playbooks/groups/mariadb-server.yml b/playbooks/groups/mariadb-server.yml index 4bc1c41776..33112d5c21 100644 --- a/playbooks/groups/mariadb-server.yml +++ b/playbooks/groups/mariadb-server.yml @@ -27,9 +27,9 @@ - sudo tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" # TODO: add iscsi task diff --git a/playbooks/groups/mbs.yml b/playbooks/groups/mbs.yml index 7ea238da9a..87f0c97b2a 100644 --- a/playbooks/groups/mbs.yml +++ b/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" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/mdapi.yml b/playbooks/groups/mdapi.yml index c0eb1e66d0..7075c0a214 100644 --- a/playbooks/groups/mdapi.yml +++ b/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" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/memcached.yml b/playbooks/groups/memcached.yml index 05886dd78d..131467107f 100644 --- a/playbooks/groups/memcached.yml +++ b/playbooks/groups/memcached.yml @@ -22,9 +22,9 @@ - memcached tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/mirrorlist2.yml b/playbooks/groups/mirrorlist2.yml index 1fd28ae6b4..6ed5a182e8 100644 --- a/playbooks/groups/mirrorlist2.yml +++ b/playbooks/groups/mirrorlist2.yml @@ -64,9 +64,9 @@ tasks: # this is how you include other task lists - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: diff --git a/playbooks/groups/mirrormanager.yml b/playbooks/groups/mirrormanager.yml index ef34c399f6..8f51459d31 100644 --- a/playbooks/groups/mirrormanager.yml +++ b/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" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/modernpaste.yml b/playbooks/groups/modernpaste.yml index 3adf8a5ca9..cdfbee64f1 100644 --- a/playbooks/groups/modernpaste.yml +++ b/playbooks/groups/modernpaste.yml @@ -27,9 +27,9 @@ - { role: openvpn/client, when: env != "staging" } tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/noc.yml b/playbooks/groups/noc.yml index b144ae19f2..d41f7c4a9d 100644 --- a/playbooks/groups/noc.yml +++ b/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" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/notifs-backend.yml b/playbooks/groups/notifs-backend.yml index a58e8bf045..46e514a38b 100644 --- a/playbooks/groups/notifs-backend.yml +++ b/playbooks/groups/notifs-backend.yml @@ -30,9 +30,9 @@ # when: env != "staging" } tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/notifs-web.yml b/playbooks/groups/notifs-web.yml index 9b69b9e49a..50bc5f6d78 100644 --- a/playbooks/groups/notifs-web.yml +++ b/playbooks/groups/notifs-web.yml @@ -30,9 +30,9 @@ when: env != "staging" } tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/nuancier.yml b/playbooks/groups/nuancier.yml index 7660c4d270..acf8c66a0a 100644 --- a/playbooks/groups/nuancier.yml +++ b/playbooks/groups/nuancier.yml @@ -28,9 +28,9 @@ - mod_wsgi tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/odcs.yml b/playbooks/groups/odcs.yml index 87a5bca38a..15504a1fd0 100644 --- a/playbooks/groups/odcs.yml +++ b/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" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/openqa-workers.yml b/playbooks/groups/openqa-workers.yml index b5375bf5d5..dddb4f6c29 100644 --- a/playbooks/groups/openqa-workers.yml +++ b/playbooks/groups/openqa-workers.yml @@ -20,9 +20,9 @@ - apache tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/openqa.yml b/playbooks/groups/openqa.yml index 760009aabc..3fabd5e2e5 100644 --- a/playbooks/groups/openqa.yml +++ b/playbooks/groups/openqa.yml @@ -23,9 +23,9 @@ - apache tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/openstack-compute-nodes.yml b/playbooks/groups/openstack-compute-nodes.yml index e8399b260e..6fc1cec972 100644 --- a/playbooks/groups/openstack-compute-nodes.yml +++ b/playbooks/groups/openstack-compute-nodes.yml @@ -21,9 +21,9 @@ - cloud_compute tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/os-cluster.yml b/playbooks/groups/os-cluster.yml index 36afbcca1e..be9aba664e 100644 --- a/playbooks/groups/os-cluster.yml +++ b/playbooks/groups/os-cluster.yml @@ -42,9 +42,9 @@ dest: "/etc/sysconfig/docker-storage-setup" - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/osbs-cluster.yml b/playbooks/groups/osbs-cluster.yml index 0b20333ef0..4b0507b915 100644 --- a/playbooks/groups/osbs-cluster.yml +++ b/playbooks/groups/osbs-cluster.yml @@ -23,9 +23,9 @@ - sudo tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/osbs-orchestrator-cluster.yml b/playbooks/groups/osbs-orchestrator-cluster.yml index ee90c02174..95ec027921 100644 --- a/playbooks/groups/osbs-orchestrator-cluster.yml +++ b/playbooks/groups/osbs-orchestrator-cluster.yml @@ -24,9 +24,9 @@ - sudo tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/packages.yml b/playbooks/groups/packages.yml index 92723f8c78..c073bece69 100644 --- a/playbooks/groups/packages.yml +++ b/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" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/pagure.yml b/playbooks/groups/pagure.yml index 6fcac8fc58..767af658d6 100644 --- a/playbooks/groups/pagure.yml +++ b/playbooks/groups/pagure.yml @@ -22,9 +22,9 @@ - postgresql_server tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/pdc.yml b/playbooks/groups/pdc.yml index 31cf1442a0..6978449f14 100644 --- a/playbooks/groups/pdc.yml +++ b/playbooks/groups/pdc.yml @@ -23,9 +23,9 @@ - sudo tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" - name: stuff for the web nodes hosts: pdc-web:pdc-web-stg diff --git a/playbooks/groups/people.yml b/playbooks/groups/people.yml index 040e139297..8dbaa957b6 100644 --- a/playbooks/groups/people.yml +++ b/playbooks/groups/people.yml @@ -81,9 +81,9 @@ - people tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/piwik.yml b/playbooks/groups/piwik.yml index 450b34feef..9b740037d6 100644 --- a/playbooks/groups/piwik.yml +++ b/playbooks/groups/piwik.yml @@ -25,9 +25,9 @@ - sudo tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/pkgdb.yml b/playbooks/groups/pkgdb.yml index 8c607dc3bf..02562b4a19 100644 --- a/playbooks/groups/pkgdb.yml +++ b/playbooks/groups/pkgdb.yml @@ -27,9 +27,9 @@ - mod_wsgi tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/pkgs.yml b/playbooks/groups/pkgs.yml index 4425462d66..ea1419c994 100644 --- a/playbooks/groups/pkgs.yml +++ b/playbooks/groups/pkgs.yml @@ -50,9 +50,9 @@ tags: - krb5 - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/postgresql-server-bdr.yml b/playbooks/groups/postgresql-server-bdr.yml index 3b283f833c..ec3fe497c7 100644 --- a/playbooks/groups/postgresql-server-bdr.yml +++ b/playbooks/groups/postgresql-server-bdr.yml @@ -29,9 +29,9 @@ - postgresql_server_bdr tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" # TODO: add iscsi task diff --git a/playbooks/groups/postgresql-server.yml b/playbooks/groups/postgresql-server.yml index bbc600b729..2557fe7c58 100644 --- a/playbooks/groups/postgresql-server.yml +++ b/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" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" # TODO: add iscsi task diff --git a/playbooks/groups/proxies.yml b/playbooks/groups/proxies.yml index 7bdc20c947..83c7d91b1b 100644 --- a/playbooks/groups/proxies.yml +++ b/playbooks/groups/proxies.yml @@ -47,15 +47,15 @@ state=link when: inventory_hostname == 'proxy01.phx2.fedoraproject.org' - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" # You might think we would want these tasks_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" - #- include_tasks: "{{ tasks_path }}/mod_wsgi.yml" + #- import_tasks: "{{ tasks_path }}/apache.yml" + #- import_tasks: "{{ tasks_path }}/mod_wsgi.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/qa.yml b/playbooks/groups/qa.yml index d7651cb51d..3134f1f850 100644 --- a/playbooks/groups/qa.yml +++ b/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" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/releng-compose.yml b/playbooks/groups/releng-compose.yml index 23776fc221..d561686c81 100644 --- a/playbooks/groups/releng-compose.yml +++ b/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" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" - name: install skopeo for container management package: diff --git a/playbooks/groups/resultsdb-dev.yml b/playbooks/groups/resultsdb-dev.yml index 08814a76fd..324b9377dd 100644 --- a/playbooks/groups/resultsdb-dev.yml +++ b/playbooks/groups/resultsdb-dev.yml @@ -28,9 +28,9 @@ tasks: # this is how you include other task lists - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/resultsdb-prod.yml b/playbooks/groups/resultsdb-prod.yml index 7282bcb150..85af1f3972 100644 --- a/playbooks/groups/resultsdb-prod.yml +++ b/playbooks/groups/resultsdb-prod.yml @@ -29,9 +29,9 @@ tasks: # this is how you include other task lists - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/resultsdb-stg.yml b/playbooks/groups/resultsdb-stg.yml index e154db386f..50044f12fc 100644 --- a/playbooks/groups/resultsdb-stg.yml +++ b/playbooks/groups/resultsdb-stg.yml @@ -28,9 +28,9 @@ tasks: # this is how you include other task lists - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/retrace.yml b/playbooks/groups/retrace.yml index 871f8d379d..ec789e67c2 100644 --- a/playbooks/groups/retrace.yml +++ b/playbooks/groups/retrace.yml @@ -20,9 +20,9 @@ - fedmsg/base tasks: - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/secondary.yml b/playbooks/groups/secondary.yml index f6eb2c3830..d01b35d9f4 100644 --- a/playbooks/groups/secondary.yml +++ b/playbooks/groups/secondary.yml @@ -47,9 +47,9 @@ - archive.fedoraproject.org - archives.fedoraproject.org tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" - name: Install some misc packages needed for various tasks package: name={{ item }} state=present diff --git a/playbooks/groups/sign-bridge.yml b/playbooks/groups/sign-bridge.yml index 5282933e60..f9a9a563cc 100644 --- a/playbooks/groups/sign-bridge.yml +++ b/playbooks/groups/sign-bridge.yml @@ -32,9 +32,9 @@ owner_group: sigul tasks: - - include_tasks: "{{ tasks_path }}/motd.yml" - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/smtp-mm.yml b/playbooks/groups/smtp-mm.yml index 4f009ea487..a76e192b11 100644 --- a/playbooks/groups/smtp-mm.yml +++ b/playbooks/groups/smtp-mm.yml @@ -24,9 +24,9 @@ when: env != "staging" } tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/statscache.yml b/playbooks/groups/statscache.yml index 0ac15bcf2a..7c5948f43c 100644 --- a/playbooks/groups/statscache.yml +++ b/playbooks/groups/statscache.yml @@ -27,9 +27,9 @@ - sudo tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" - name: Stuff just for the web frontend hosts: statscache-web:statscache-web-stg diff --git a/playbooks/groups/summershum.yml b/playbooks/groups/summershum.yml index af9ac1d50f..199fb02613 100644 --- a/playbooks/groups/summershum.yml +++ b/playbooks/groups/summershum.yml @@ -29,9 +29,9 @@ # when: env != "staging" } tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/sundries.yml b/playbooks/groups/sundries.yml index f4768a6887..d000218b2b 100644 --- a/playbooks/groups/sundries.yml +++ b/playbooks/groups/sundries.yml @@ -55,10 +55,10 @@ when: master_sundries_node tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" - - include_tasks: "{{ tasks_path }}/reg-server.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/reg-server.yml" when: master_sundries_node and env == "staging" handlers: diff --git a/playbooks/groups/tagger.yml b/playbooks/groups/tagger.yml index e87a326dca..ff22642269 100644 --- a/playbooks/groups/tagger.yml +++ b/playbooks/groups/tagger.yml @@ -29,9 +29,9 @@ - mod_wsgi tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/taskotron-client-hosts.yml b/playbooks/groups/taskotron-client-hosts.yml index 0e81de56c9..45136937a2 100644 --- a/playbooks/groups/taskotron-client-hosts.yml +++ b/playbooks/groups/taskotron-client-hosts.yml @@ -15,7 +15,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" roles: - base @@ -28,8 +28,8 @@ - { role: openvpn/client, when: datacenter != "phx2" } tasks: - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/taskotron.yml b/playbooks/groups/taskotron.yml index 8ca34229a9..a36f55f08e 100644 --- a/playbooks/groups/taskotron.yml +++ b/playbooks/groups/taskotron.yml @@ -31,9 +31,9 @@ tasks: # this is how you include other task lists - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/torrent.yml b/playbooks/groups/torrent.yml index 22e26d6d1e..f80e989edb 100644 --- a/playbooks/groups/torrent.yml +++ b/playbooks/groups/torrent.yml @@ -35,9 +35,9 @@ sslonly: true tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/transitional-datanommer.yml b/playbooks/groups/transitional-datanommer.yml index b02c26be27..70e7b91f16 100644 --- a/playbooks/groups/transitional-datanommer.yml +++ b/playbooks/groups/transitional-datanommer.yml @@ -22,9 +22,9 @@ - openvpn/client tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/twisted-buildbots.yml b/playbooks/groups/twisted-buildbots.yml index 195af2ee8a..2a5c853029 100644 --- a/playbooks/groups/twisted-buildbots.yml +++ b/playbooks/groups/twisted-buildbots.yml @@ -9,7 +9,7 @@ - /srv/private/ansible/files/openstack/passwords.yml tasks: - - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" + - import_tasks: "{{ tasks_path }}/persistent_cloud.yml" - name: setup all the things hosts: twisted-buildbots @@ -21,7 +21,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include_tasks: "{{ 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}}" diff --git a/playbooks/groups/unbound.yml b/playbooks/groups/unbound.yml index cdfd8c860b..eb6cc900ed 100644 --- a/playbooks/groups/unbound.yml +++ b/playbooks/groups/unbound.yml @@ -23,9 +23,9 @@ when: env != "staging" } tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/value.yml b/playbooks/groups/value.yml index 6d1e0c400f..ef8819b4f9 100644 --- a/playbooks/groups/value.yml +++ b/playbooks/groups/value.yml @@ -30,9 +30,9 @@ - mote tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/virthost.yml b/playbooks/groups/virthost.yml index 525f57c886..ee20c955bd 100644 --- a/playbooks/groups/virthost.yml +++ b/playbooks/groups/virthost.yml @@ -13,7 +13,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" roles: - base @@ -28,8 +28,8 @@ - virthost tasks: - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/wiki.yml b/playbooks/groups/wiki.yml index 4d4d9828d4..4bab8ef09f 100644 --- a/playbooks/groups/wiki.yml +++ b/playbooks/groups/wiki.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 @@ -36,8 +36,8 @@ when: env != "staging" } tasks: - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/zanata2fedmsg.yml b/playbooks/groups/zanata2fedmsg.yml index 37b8d2882f..2acc1c3252 100644 --- a/playbooks/groups/zanata2fedmsg.yml +++ b/playbooks/groups/zanata2fedmsg.yml @@ -29,9 +29,9 @@ - mod_wsgi tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/hosts/ansiblemagazine.fedorainfracloud.org.yml b/playbooks/hosts/ansiblemagazine.fedorainfracloud.org.yml index 4de05c9da9..17d0514d00 100644 --- a/playbooks/hosts/ansiblemagazine.fedorainfracloud.org.yml +++ b/playbooks/hosts/ansiblemagazine.fedorainfracloud.org.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" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" @@ -24,7 +24,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}}" diff --git a/playbooks/hosts/artboard.fedorainfracloud.org.yml b/playbooks/hosts/artboard.fedorainfracloud.org.yml index be59c953bd..fa3dae7058 100644 --- a/playbooks/hosts/artboard.fedorainfracloud.org.yml +++ b/playbooks/hosts/artboard.fedorainfracloud.org.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" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" @@ -24,7 +24,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}}" diff --git a/playbooks/hosts/blockerbugs-dev.cloud.fedoraproject.org.yml b/playbooks/hosts/blockerbugs-dev.cloud.fedoraproject.org.yml index 3fe5baf2e6..a5d0b48d41 100644 --- a/playbooks/hosts/blockerbugs-dev.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/blockerbugs-dev.cloud.fedoraproject.org.yml @@ -8,8 +8,8 @@ - "/srv/private/ansible/vars.yml" tasks: - - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" - - include_tasks: "{{ tasks_path }}/growroot_cloud.yml" + - import_tasks: "{{ tasks_path }}/persistent_cloud.yml" + - import_tasks: "{{ tasks_path }}/growroot_cloud.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" @@ -31,7 +31,7 @@ - basessh tasks: - - include_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" + - import_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" - name: mount up blockerbugs-dev to /srv/persistent mount: name=/srv/persistent src='LABEL=blockerbugs-dev' fstype=ext4 state=mounted diff --git a/playbooks/hosts/cloud-noc01.cloud.fedoraproject.org.yml b/playbooks/hosts/cloud-noc01.cloud.fedoraproject.org.yml index c035510402..94c9fbb8af 100644 --- a/playbooks/hosts/cloud-noc01.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/cloud-noc01.cloud.fedoraproject.org.yml @@ -22,9 +22,9 @@ - tftp_server tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/hosts/commops.fedorainfracloud.org.yml b/playbooks/hosts/commops.fedorainfracloud.org.yml index a0cd6522e3..bea8320622 100644 --- a/playbooks/hosts/commops.fedorainfracloud.org.yml +++ b/playbooks/hosts/commops.fedorainfracloud.org.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" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" @@ -24,7 +24,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}}" diff --git a/playbooks/hosts/communityblog.fedorainfracloud.org.yml b/playbooks/hosts/communityblog.fedorainfracloud.org.yml index 5f6c0e739a..e0e00d10e3 100644 --- a/playbooks/hosts/communityblog.fedorainfracloud.org.yml +++ b/playbooks/hosts/communityblog.fedorainfracloud.org.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" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" @@ -24,7 +24,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}}" diff --git a/playbooks/hosts/darkserver-dev.fedorainfracloud.org.yml b/playbooks/hosts/darkserver-dev.fedorainfracloud.org.yml index fe1db02372..281a3fb72a 100644 --- a/playbooks/hosts/darkserver-dev.fedorainfracloud.org.yml +++ b/playbooks/hosts/darkserver-dev.fedorainfracloud.org.yml @@ -9,8 +9,8 @@ - /srv/private/ansible/files/openstack/passwords.yml tasks: - - include_tasks: "{{ tasks_path }}/persistent_cloud.yml" - - include_tasks: "{{ tasks_path }}/growroot_cloud_el7.yml" + - import_tasks: "{{ tasks_path }}/persistent_cloud.yml" + - import_tasks: "{{ tasks_path }}/growroot_cloud_el7.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" @@ -25,7 +25,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}}" diff --git a/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml b/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml index eb25380d54..344deded63 100644 --- a/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml +++ b/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml @@ -11,7 +11,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" roles: - base @@ -31,8 +31,8 @@ - web-data-analysis tasks: - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/hosts/developer.fedorainfracloud.org.yml b/playbooks/hosts/developer.fedorainfracloud.org.yml index d0d9caa491..ccaadfbde2 100644 --- a/playbooks/hosts/developer.fedorainfracloud.org.yml +++ b/playbooks/hosts/developer.fedorainfracloud.org.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" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" @@ -24,7 +24,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" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" diff --git a/playbooks/hosts/eclipse.fedorainfracloud.org.yml b/playbooks/hosts/eclipse.fedorainfracloud.org.yml index 49e72b398d..a6213b3bcd 100644 --- a/playbooks/hosts/eclipse.fedorainfracloud.org.yml +++ b/playbooks/hosts/eclipse.fedorainfracloud.org.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" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" @@ -24,12 +24,12 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" roles: - basessh 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}}" diff --git a/playbooks/hosts/faitout.fedorainfracloud.org.yml b/playbooks/hosts/faitout.fedorainfracloud.org.yml index 6d4e0ad46d..c30969f383 100644 --- a/playbooks/hosts/faitout.fedorainfracloud.org.yml +++ b/playbooks/hosts/faitout.fedorainfracloud.org.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" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" @@ -24,7 +24,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}}" diff --git a/playbooks/hosts/fas2-dev.fedorainfracloud.org.yml b/playbooks/hosts/fas2-dev.fedorainfracloud.org.yml index f21c75844c..a55e0e20ba 100644 --- a/playbooks/hosts/fas2-dev.fedorainfracloud.org.yml +++ b/playbooks/hosts/fas2-dev.fedorainfracloud.org.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" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" @@ -24,7 +24,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}}" diff --git a/playbooks/hosts/fas3-dev.fedorainfracloud.org.yml b/playbooks/hosts/fas3-dev.fedorainfracloud.org.yml index e06c58214c..fea251f09c 100644 --- a/playbooks/hosts/fas3-dev.fedorainfracloud.org.yml +++ b/playbooks/hosts/fas3-dev.fedorainfracloud.org.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" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" @@ -24,7 +24,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}}" diff --git a/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml b/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml index 4a96ce43ce..3542083dfa 100644 --- a/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml @@ -44,11 +44,11 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - - include_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" + - import_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" vars: root_auth_users: msuchy - - include_tasks: "{{ tasks_path }}/motd.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" - name: set root passwd user: name=root password={{ cloud_rootpw }} state=present diff --git a/playbooks/hosts/fedimg-dev.fedorainfracloud.org.yml b/playbooks/hosts/fedimg-dev.fedorainfracloud.org.yml index 3309d82ef1..5a03a849be 100644 --- a/playbooks/hosts/fedimg-dev.fedorainfracloud.org.yml +++ b/playbooks/hosts/fedimg-dev.fedorainfracloud.org.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" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" @@ -24,14 +24,14 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.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}}" diff --git a/playbooks/hosts/fedora-bootstrap.fedorainfracloud.org.yml b/playbooks/hosts/fedora-bootstrap.fedorainfracloud.org.yml index 51b8813195..840e7c6ef5 100644 --- a/playbooks/hosts/fedora-bootstrap.fedorainfracloud.org.yml +++ b/playbooks/hosts/fedora-bootstrap.fedorainfracloud.org.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" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" @@ -24,7 +24,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}}" diff --git a/playbooks/hosts/glittergallery-dev.fedorainfracloud.org.yml b/playbooks/hosts/glittergallery-dev.fedorainfracloud.org.yml index 56749ea3ff..dc7e492553 100644 --- a/playbooks/hosts/glittergallery-dev.fedorainfracloud.org.yml +++ b/playbooks/hosts/glittergallery-dev.fedorainfracloud.org.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" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" @@ -24,7 +24,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}}" diff --git a/playbooks/hosts/grafana.cloud.fedoraproject.org.yml b/playbooks/hosts/grafana.cloud.fedoraproject.org.yml index 1352d375ef..a20feab6f0 100644 --- a/playbooks/hosts/grafana.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/grafana.cloud.fedoraproject.org.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" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" @@ -33,14 +33,14 @@ - graphite/grafana tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - #- include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + #- import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.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}}" diff --git a/playbooks/hosts/graphite.fedorainfracloud.org.yml b/playbooks/hosts/graphite.fedorainfracloud.org.yml index 708d64bd2a..0889210d1b 100644 --- a/playbooks/hosts/graphite.fedorainfracloud.org.yml +++ b/playbooks/hosts/graphite.fedorainfracloud.org.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" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" @@ -33,14 +33,14 @@ - graphite/fedmsg2statsd tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - #- include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + #- import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.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}}" diff --git a/playbooks/hosts/hubs-dev.fedorainfracloud.org.yml b/playbooks/hosts/hubs-dev.fedorainfracloud.org.yml index d30aa066d5..ab46342d19 100644 --- a/playbooks/hosts/hubs-dev.fedorainfracloud.org.yml +++ b/playbooks/hosts/hubs-dev.fedorainfracloud.org.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" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" @@ -26,12 +26,12 @@ 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" - dnf: name={{item}} state=present with_items: diff --git a/playbooks/hosts/iddev.fedorainfracloud.org.yml b/playbooks/hosts/iddev.fedorainfracloud.org.yml index 865776d21b..d548296910 100644 --- a/playbooks/hosts/iddev.fedorainfracloud.org.yml +++ b/playbooks/hosts/iddev.fedorainfracloud.org.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" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" @@ -31,10 +31,10 @@ - base pre_tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" 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}}" diff --git a/playbooks/hosts/insim.fedorainfracloud.org.yml b/playbooks/hosts/insim.fedorainfracloud.org.yml index c4d5a0cda3..8be270a54d 100644 --- a/playbooks/hosts/insim.fedorainfracloud.org.yml +++ b/playbooks/hosts/insim.fedorainfracloud.org.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" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" @@ -25,7 +25,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}}" diff --git a/playbooks/hosts/java-deptools.fedorainfracloud.org b/playbooks/hosts/java-deptools.fedorainfracloud.org index 7bb571a6c7..15971cc03c 100644 --- a/playbooks/hosts/java-deptools.fedorainfracloud.org +++ b/playbooks/hosts/java-deptools.fedorainfracloud.org @@ -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" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" @@ -24,7 +24,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) shell: "hostname {{inventory_hostname}}" diff --git a/playbooks/hosts/lists-dev.fedorainfracloud.org.yml b/playbooks/hosts/lists-dev.fedorainfracloud.org.yml index 3fdc8ec5d5..d8685dd172 100644 --- a/playbooks/hosts/lists-dev.fedorainfracloud.org.yml +++ b/playbooks/hosts/lists-dev.fedorainfracloud.org.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" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" @@ -28,7 +28,7 @@ - postfix_maincf: "{{ roles_path }}/base/files/postfix/main.cf/main.cf.{{ inventory_hostname }}" 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}}" @@ -40,9 +40,9 @@ - base tasks: - - include_tasks: "{{ tasks_path }}/postfix_basic.yml" - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/postfix_basic.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" # Basic Apache config - name: install mod_ssl diff --git a/playbooks/hosts/magazine2.fedorainfracloud.org.yml b/playbooks/hosts/magazine2.fedorainfracloud.org.yml index 5b999649b5..f9521abe5a 100644 --- a/playbooks/hosts/magazine2.fedorainfracloud.org.yml +++ b/playbooks/hosts/magazine2.fedorainfracloud.org.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" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" @@ -24,7 +24,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}}" diff --git a/playbooks/hosts/modernpaste.fedorainfracloud.org.yml b/playbooks/hosts/modernpaste.fedorainfracloud.org.yml index 4b8d59c130..635459cf44 100644 --- a/playbooks/hosts/modernpaste.fedorainfracloud.org.yml +++ b/playbooks/hosts/modernpaste.fedorainfracloud.org.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" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" @@ -31,9 +31,9 @@ - base pre_tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" 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}}" diff --git a/playbooks/hosts/modularity.fedorainfracloud.org.yml b/playbooks/hosts/modularity.fedorainfracloud.org.yml index 489b3cb902..d131c16171 100644 --- a/playbooks/hosts/modularity.fedorainfracloud.org.yml +++ b/playbooks/hosts/modularity.fedorainfracloud.org.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" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" @@ -24,7 +24,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}}" diff --git a/playbooks/hosts/regcfp2.fedorainfracloud.org.yml b/playbooks/hosts/regcfp2.fedorainfracloud.org.yml index b962f014d6..3242f9c197 100644 --- a/playbooks/hosts/regcfp2.fedorainfracloud.org.yml +++ b/playbooks/hosts/regcfp2.fedorainfracloud.org.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" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" @@ -24,7 +24,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}}" diff --git a/playbooks/hosts/respins.fedorainfracloud.org.yml b/playbooks/hosts/respins.fedorainfracloud.org.yml index 957a578a70..d34336d297 100644 --- a/playbooks/hosts/respins.fedorainfracloud.org.yml +++ b/playbooks/hosts/respins.fedorainfracloud.org.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" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" @@ -24,7 +24,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}}" diff --git a/playbooks/hosts/shumgrepper-dev.fedorainfracloud.org.yml b/playbooks/hosts/shumgrepper-dev.fedorainfracloud.org.yml index e7290d1d31..7c49b94345 100644 --- a/playbooks/hosts/shumgrepper-dev.fedorainfracloud.org.yml +++ b/playbooks/hosts/shumgrepper-dev.fedorainfracloud.org.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" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" @@ -24,7 +24,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}}" diff --git a/playbooks/hosts/taiga.fedorainfracloud.org.yml b/playbooks/hosts/taiga.fedorainfracloud.org.yml index 38dd2e72de..8f1650fdc8 100644 --- a/playbooks/hosts/taiga.fedorainfracloud.org.yml +++ b/playbooks/hosts/taiga.fedorainfracloud.org.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" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" @@ -23,7 +23,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}}" diff --git a/playbooks/hosts/taigastg.fedorainfracloud.org.yml b/playbooks/hosts/taigastg.fedorainfracloud.org.yml index dd689bb566..9acf4d5084 100644 --- a/playbooks/hosts/taigastg.fedorainfracloud.org.yml +++ b/playbooks/hosts/taigastg.fedorainfracloud.org.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" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" @@ -24,7 +24,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}}" diff --git a/playbooks/hosts/testdays.fedorainfracloud.org.yml b/playbooks/hosts/testdays.fedorainfracloud.org.yml index 3b7c6c94ea..20982c3a60 100644 --- a/playbooks/hosts/testdays.fedorainfracloud.org.yml +++ b/playbooks/hosts/testdays.fedorainfracloud.org.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" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" @@ -25,7 +25,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}}" diff --git a/playbooks/hosts/upstreamfirst.fedorainfracloud.org.yml b/playbooks/hosts/upstreamfirst.fedorainfracloud.org.yml index b8f6843769..4cee012b5f 100644 --- a/playbooks/hosts/upstreamfirst.fedorainfracloud.org.yml +++ b/playbooks/hosts/upstreamfirst.fedorainfracloud.org.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" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" @@ -36,9 +36,9 @@ - certbot tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/include/virt-create.yml b/playbooks/include/virt-create.yml index 17d108e679..48efb79b13 100644 --- a/playbooks/include/virt-create.yml +++ b/playbooks/include/virt-create.yml @@ -8,7 +8,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - - include_tasks: "{{ tasks_path }}/virt_instance_create.yml" + - import_tasks: "{{ tasks_path }}/virt_instance_create.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/manual/autosign.yml b/playbooks/manual/autosign.yml index 82b4af6255..3dc8ac0a73 100644 --- a/playbooks/manual/autosign.yml +++ b/playbooks/manual/autosign.yml @@ -36,9 +36,9 @@ - robosignatory tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/manual/kernel-qa.yml b/playbooks/manual/kernel-qa.yml index ea361766e5..7928424415 100644 --- a/playbooks/manual/kernel-qa.yml +++ b/playbooks/manual/kernel-qa.yml @@ -21,9 +21,9 @@ - hosts tasks: - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/manual/push-badges.yml b/playbooks/manual/push-badges.yml index 5269a02bbb..b2213f981c 100644 --- a/playbooks/manual/push-badges.yml +++ b/playbooks/manual/push-badges.yml @@ -42,7 +42,7 @@ command: git pull origin master chdir={{workingdir}} handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: copy new badge art over to the badges web nodes hosts: badges-web:badges-web-stg @@ -58,7 +58,7 @@ - badges/frontend handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: copy any new badges rules over to the badges backend and restart it hosts: badges-backend:badges-backend-stg @@ -74,4 +74,4 @@ - badges/backend handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/manual/qadevel.yml b/playbooks/manual/qadevel.yml index 1c74d87667..33b04c1d79 100644 --- a/playbooks/manual/qadevel.yml +++ b/playbooks/manual/qadevel.yml @@ -14,10 +14,10 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - - include_tasks: "{{ tasks_path }}/virt_instance_create.yml" + - import_tasks: "{{ tasks_path }}/virt_instance_create.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: make the box be real hosts: qadevel:qadevel-stg @@ -38,10 +38,10 @@ - sudo tasks: - - include_tasks: "{{ tasks_path }}/hosts.yml" - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/2fa_client.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/hosts.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/2fa_client.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/manual/releng-emergency-expire-old-repo.yml b/playbooks/manual/releng-emergency-expire-old-repo.yml index 3ddfe8451b..90fbbf73be 100644 --- a/playbooks/manual/releng-emergency-expire-old-repo.yml +++ b/playbooks/manual/releng-emergency-expire-old-repo.yml @@ -35,4 +35,4 @@ command: /usr/local/bin/sync_pkl_to_mirrorlists.sh handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/manual/restart-pagure.yml b/playbooks/manual/restart-pagure.yml index 2a3411e6df..9f9630127e 100644 --- a/playbooks/manual/restart-pagure.yml +++ b/playbooks/manual/restart-pagure.yml @@ -6,7 +6,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - name: ask puiterwijk if he would like to capture debug info before restarting. diff --git a/playbooks/manual/restart-pkgdb.yml b/playbooks/manual/restart-pkgdb.yml index 81c684167a..fa6038dc07 100644 --- a/playbooks/manual/restart-pkgdb.yml +++ b/playbooks/manual/restart-pkgdb.yml @@ -6,7 +6,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - name: Start apache diff --git a/playbooks/manual/sign-vault.yml b/playbooks/manual/sign-vault.yml index 79fe880eb3..9a54454211 100644 --- a/playbooks/manual/sign-vault.yml +++ b/playbooks/manual/sign-vault.yml @@ -17,10 +17,10 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - - include_tasks: "{{ tasks_path }}/virt_instance_create.yml" + - import_tasks: "{{ tasks_path }}/virt_instance_create.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: make sign vault server hosts: sign-vault @@ -39,8 +39,8 @@ - sigul/server tasks: - - include_tasks: "{{ tasks_path }}/yumrepos.yml" - - include_tasks: "{{ tasks_path }}/motd.yml" + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + - import_tasks: "{{ tasks_path }}/motd.yml" handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/manual/staging-sync/bodhi.yml b/playbooks/manual/staging-sync/bodhi.yml index 935fa1510d..ae3a79c17e 100644 --- a/playbooks/manual/staging-sync/bodhi.yml +++ b/playbooks/manual/staging-sync/bodhi.yml @@ -36,7 +36,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - copy: src=/srv/web/infra/db-dumps/bodhi2.dump.xz dest=/var/tmp/bodhi2.dump.xz diff --git a/playbooks/manual/staging-sync/db-sync.yml b/playbooks/manual/staging-sync/db-sync.yml index a34fb33e87..fdf2c4dabe 100644 --- a/playbooks/manual/staging-sync/db-sync.yml +++ b/playbooks/manual/staging-sync/db-sync.yml @@ -21,7 +21,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - service: name=httpd state=stopped @@ -38,7 +38,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - name: Dumping the production db. This might take a minute. Go out to the lobby! @@ -62,7 +62,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: # push dump to stg from batcave @@ -86,7 +86,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - service: name=httpd state=started @@ -103,7 +103,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - name: Remove the db dump on the prod server @@ -118,7 +118,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - command: rm -f /var/tmp/{{ db }}.dump.xz diff --git a/playbooks/manual/staging-sync/fas.yml b/playbooks/manual/staging-sync/fas.yml index 9f98cbcd0e..71a62fc42e 100644 --- a/playbooks/manual/staging-sync/fas.yml +++ b/playbooks/manual/staging-sync/fas.yml @@ -10,7 +10,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - service: name=httpd state=stopped @@ -27,7 +27,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - name: Dumping the production db. This might take a minute. Go out to the lobby! @@ -52,7 +52,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: # @@ -79,7 +79,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - service: name=httpd state=started @@ -96,7 +96,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - name: Remove the db dump on the prod server @@ -111,7 +111,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: # diff --git a/playbooks/manual/staging-sync/koji.yml b/playbooks/manual/staging-sync/koji.yml index 79bd83f676..4ac9e96a18 100644 --- a/playbooks/manual/staging-sync/koji.yml +++ b/playbooks/manual/staging-sync/koji.yml @@ -17,7 +17,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - service: name=httpd state=stopped @@ -37,7 +37,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - template: src=templates/koji-reset-staging.sql dest=/var/lib/pgsql/koji-reset-staging.sql @@ -68,7 +68,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - service: name=httpd state=started diff --git a/playbooks/manual/staging-sync/koschei.yml b/playbooks/manual/staging-sync/koschei.yml index e4fc231ab8..b89ec34a29 100644 --- a/playbooks/manual/staging-sync/koschei.yml +++ b/playbooks/manual/staging-sync/koschei.yml @@ -14,7 +14,7 @@ - /srv/private/ansible/vars.yml - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - service: name={{ item }} state=stopped @@ -34,7 +34,7 @@ - /srv/private/ansible/vars.yml - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - shell: > @@ -69,7 +69,7 @@ - /srv/private/ansible/vars.yml - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - service: name={{ item }} state=started diff --git a/playbooks/manual/staging-sync/mailman.yml b/playbooks/manual/staging-sync/mailman.yml index 0d4f3d9d4b..5104c60a1a 100644 --- a/playbooks/manual/staging-sync/mailman.yml +++ b/playbooks/manual/staging-sync/mailman.yml @@ -10,7 +10,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - service: name=webui-qcluster state=stopped @@ -30,7 +30,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: #- template: src=templates/mailman-reset-staging.sql dest=/var/lib/pgsql/mailman-reset-staging.sql @@ -87,7 +87,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - command: /srv/webui/bin/prod-to-stg.py diff --git a/playbooks/manual/staging-sync/pdc.yml b/playbooks/manual/staging-sync/pdc.yml index 9e345d8f92..a76f518109 100644 --- a/playbooks/manual/staging-sync/pdc.yml +++ b/playbooks/manual/staging-sync/pdc.yml @@ -36,7 +36,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - copy: src=/srv/web/infra/db-dumps/pdc.dump.xz dest=/var/tmp/pdc.dump.xz diff --git a/playbooks/manual/stop_pkgdb.yml b/playbooks/manual/stop_pkgdb.yml index e1bab3078e..e9fc632845 100644 --- a/playbooks/manual/stop_pkgdb.yml +++ b/playbooks/manual/stop_pkgdb.yml @@ -6,7 +6,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush w.r.t. apache diff --git a/playbooks/manual/update-firmware.yml b/playbooks/manual/update-firmware.yml index 28be4f6d33..301880a94d 100644 --- a/playbooks/manual/update-firmware.yml +++ b/playbooks/manual/update-firmware.yml @@ -24,7 +24,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" vars: - updates: diff --git a/playbooks/manual/upgrade/anitya.yml b/playbooks/manual/upgrade/anitya.yml index 31d31c3974..b5a848db7b 100644 --- a/playbooks/manual/upgrade/anitya.yml +++ b/playbooks/manual/upgrade/anitya.yml @@ -6,7 +6,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - name: clean all metadata {%if testing%}(with infrastructure-testing on){%endif%} command: yum clean all {%if testing%} --enablerepo=infrastructure-tags-stg {%endif%} @@ -26,7 +26,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush w.r.t. the frontend nagios: action=downtime minutes=15 service=host host={{ inventory_hostname_short }}{{ env_suffix }} @@ -50,7 +50,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush w.r.t. the backend nagios: action=downtime minutes=15 service=host host={{ inventory_hostname_short }}{{ env_suffix }} diff --git a/playbooks/manual/upgrade/autocloud.yml b/playbooks/manual/upgrade/autocloud.yml index 0a5be63f49..6015d982ca 100644 --- a/playbooks/manual/upgrade/autocloud.yml +++ b/playbooks/manual/upgrade/autocloud.yml @@ -8,7 +8,7 @@ vars: testing: False handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - name: clean all metadata @@ -31,7 +31,7 @@ vars: testing: False handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - name: dnf update tunir packages from main repo @@ -51,7 +51,7 @@ vars: testing: False handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - name: dnf update fedfind packages from main repo @@ -71,7 +71,7 @@ vars: testing: False handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - name: dnf update fedfind packages from main repo @@ -89,7 +89,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush w.r.t. the frontend @@ -111,7 +111,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush w.r.t. the backend @@ -154,7 +154,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - service: name="httpd" state=started diff --git a/playbooks/manual/upgrade/badges.yml b/playbooks/manual/upgrade/badges.yml index 0616776bd2..2916dabde2 100644 --- a/playbooks/manual/upgrade/badges.yml +++ b/playbooks/manual/upgrade/badges.yml @@ -8,7 +8,7 @@ vars: testing: False handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - name: clean all metadata {%if testing%}(with infrastructure-testing on){%endif%} @@ -37,7 +37,7 @@ vars: testing: False handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - name: clean all metadata {%if testing%}(with infrastructure-testing on){%endif%} @@ -64,7 +64,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush w.r.t. the frontend @@ -86,7 +86,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush w.r.t. the backend @@ -124,7 +124,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - service: name="httpd" state=started diff --git a/playbooks/manual/upgrade/bodhi.yml b/playbooks/manual/upgrade/bodhi.yml index 689f4eb953..c5fd790502 100644 --- a/playbooks/manual/upgrade/bodhi.yml +++ b/playbooks/manual/upgrade/bodhi.yml @@ -25,7 +25,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - name: clean all metadata {%if testing%}(with infrastructure-testing on){%endif%} @@ -53,7 +53,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush w.r.t. the frontend @@ -75,7 +75,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush w.r.t. the backend @@ -113,7 +113,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - service: name="httpd" state=started diff --git a/playbooks/manual/upgrade/bugyou.yml b/playbooks/manual/upgrade/bugyou.yml index 109cc4d308..bd87441fe8 100644 --- a/playbooks/manual/upgrade/bugyou.yml +++ b/playbooks/manual/upgrade/bugyou.yml @@ -8,7 +8,7 @@ vars: testing: False handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - name: clean all metadata {%if testing%}(with infrastructure-testing on){%endif%} @@ -29,7 +29,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush w.r.t. the backend diff --git a/playbooks/manual/upgrade/bugzilla2fedmsg.yml b/playbooks/manual/upgrade/bugzilla2fedmsg.yml index 98deaca53b..2f6c3fa757 100644 --- a/playbooks/manual/upgrade/bugzilla2fedmsg.yml +++ b/playbooks/manual/upgrade/bugzilla2fedmsg.yml @@ -8,7 +8,7 @@ vars: testing: False handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - name: clean all metadata {%if testing%}(with infrastructure-testing on){%endif%} @@ -29,7 +29,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush diff --git a/playbooks/manual/upgrade/datagrepper.yml b/playbooks/manual/upgrade/datagrepper.yml index a0f7131ad7..aea046edde 100644 --- a/playbooks/manual/upgrade/datagrepper.yml +++ b/playbooks/manual/upgrade/datagrepper.yml @@ -8,7 +8,7 @@ vars: testing: False handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - name: clean all metadata {%if testing%}(with infrastructure-testing on){%endif%} @@ -29,7 +29,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush diff --git a/playbooks/manual/upgrade/datanommer.yml b/playbooks/manual/upgrade/datanommer.yml index 224bfc569d..10d986e561 100644 --- a/playbooks/manual/upgrade/datanommer.yml +++ b/playbooks/manual/upgrade/datanommer.yml @@ -16,7 +16,7 @@ vars: testing: False handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - name: clean all metadata {%if testing%}(with infrastructure-testing on){%endif%} @@ -37,7 +37,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush nagios: action=downtime minutes=120 service=host host={{ inventory_hostname_short }}{{ env_suffix }} @@ -56,7 +56,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush nagios: action=downtime minutes=120 service=host host={{ inventory_hostname_short }}{{ env_suffix }} @@ -75,7 +75,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush nagios: action=downtime minutes=120 service=host host={{ inventory_hostname_short }}{{ env_suffix }} @@ -94,7 +94,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush nagios: action=downtime minutes=120 service=host host={{ inventory_hostname_short }}{{ env_suffix }} diff --git a/playbooks/manual/upgrade/fedimg.yml b/playbooks/manual/upgrade/fedimg.yml index a7ec10787e..6a171603f1 100644 --- a/playbooks/manual/upgrade/fedimg.yml +++ b/playbooks/manual/upgrade/fedimg.yml @@ -8,7 +8,7 @@ vars: testing: False handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - name: clean all metadata {%if testing%}(with infrastructure-testing on){%endif%} @@ -34,7 +34,7 @@ vars: testing: False handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - name: yum update fedfind packages from main repo @@ -54,7 +54,7 @@ vars: testing: False handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - name: yum update fedfind packages from main repo @@ -72,7 +72,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush diff --git a/playbooks/manual/upgrade/fedmsg.yml b/playbooks/manual/upgrade/fedmsg.yml index 082e0f2ca3..20cdc332e8 100644 --- a/playbooks/manual/upgrade/fedmsg.yml +++ b/playbooks/manual/upgrade/fedmsg.yml @@ -33,7 +33,7 @@ - python2-fedmsg-meta-fedora-infrastructure - python-moksha-hub handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - name: clean all metadata {%if testing%}(with infrastructure-testing on){%endif%} @@ -49,7 +49,7 @@ with_items: "{{packages}}" # Restart all the backend daemons -- include_tasks: ../restart-fedmsg-services.yml +- import_tasks: ../restart-fedmsg-services.yml # Also restart the frontend web services - name: bounce apache @@ -60,7 +60,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - service: name="httpd" state=restarted diff --git a/playbooks/manual/upgrade/fmn.yml b/playbooks/manual/upgrade/fmn.yml index d4091d6f93..b2f2542646 100644 --- a/playbooks/manual/upgrade/fmn.yml +++ b/playbooks/manual/upgrade/fmn.yml @@ -8,7 +8,7 @@ vars: testing: False handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - name: clean all metadata {%if testing%}(with infrastructure-testing on){%endif%} @@ -32,7 +32,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush w.r.t. the frontend @@ -54,7 +54,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush w.r.t. the backend @@ -111,7 +111,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - service: name="httpd" state=started diff --git a/playbooks/manual/upgrade/hotness.yml b/playbooks/manual/upgrade/hotness.yml index e23e0e89a2..bd3ffb65aa 100644 --- a/playbooks/manual/upgrade/hotness.yml +++ b/playbooks/manual/upgrade/hotness.yml @@ -8,7 +8,7 @@ vars: testing: False handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - name: clean all metadata {%if testing%}(with infrastructure-testing on){%endif%} @@ -29,7 +29,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush diff --git a/playbooks/manual/upgrade/koschei.yml b/playbooks/manual/upgrade/koschei.yml index 0aa5f055bc..c41831a779 100644 --- a/playbooks/manual/upgrade/koschei.yml +++ b/playbooks/manual/upgrade/koschei.yml @@ -5,7 +5,7 @@ - /srv/private/ansible/vars.yml - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" roles: - mod_wsgi - koschei/frontend @@ -17,7 +17,7 @@ - /srv/private/ansible/vars.yml - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" roles: - koschei/backend @@ -106,7 +106,7 @@ - /srv/private/ansible/vars.yml - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" roles: - mod_wsgi - koschei/frontend @@ -118,7 +118,7 @@ - /srv/private/ansible/vars.yml - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" roles: - koschei/backend diff --git a/playbooks/manual/upgrade/mbs.yml b/playbooks/manual/upgrade/mbs.yml index 904a02fe74..68cda885d2 100644 --- a/playbooks/manual/upgrade/mbs.yml +++ b/playbooks/manual/upgrade/mbs.yml @@ -8,7 +8,7 @@ vars: testing: False handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - name: clean all metadata {%if testing%}(with infrastructure-testing on){%endif%} @@ -37,7 +37,7 @@ vars: testing: False handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - name: clean all metadata {%if testing%}(with infrastructure-testing on){%endif%} @@ -64,7 +64,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush w.r.t. the frontend @@ -87,7 +87,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush w.r.t. the backend @@ -124,7 +124,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - service: name="httpd" state=started diff --git a/playbooks/manual/upgrade/mote.yml b/playbooks/manual/upgrade/mote.yml index c80e67edc3..db3effc266 100644 --- a/playbooks/manual/upgrade/mote.yml +++ b/playbooks/manual/upgrade/mote.yml @@ -8,7 +8,7 @@ vars: testing: False handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - name: clean all metadata {%if testing%}(with infrastructure-testing on){%endif%} @@ -29,7 +29,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush diff --git a/playbooks/manual/upgrade/odcs.yml b/playbooks/manual/upgrade/odcs.yml index bf215c426a..ddbd66ab83 100644 --- a/playbooks/manual/upgrade/odcs.yml +++ b/playbooks/manual/upgrade/odcs.yml @@ -9,7 +9,7 @@ testing: False odcs_migrate_db: True handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - name: clean all metadata {%if testing%}(with infrastructure-tags-stg on){%endif%} @@ -37,7 +37,7 @@ testing: False odcs_migrate_db: True handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - name: clean all metadata {%if testing%}(with infrastructure-tags-stg on){%endif%} @@ -64,7 +64,7 @@ vars: odcs_migrate_db: True handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush w.r.t. the frontend @@ -89,7 +89,7 @@ vars: odcs_migrate_db: True handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush w.r.t. the backend @@ -119,7 +119,7 @@ vars: odcs_migrate_db: True handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - service: name="httpd" state=started diff --git a/playbooks/manual/upgrade/packages.yml b/playbooks/manual/upgrade/packages.yml index 8ee0470591..7e7c2479c3 100644 --- a/playbooks/manual/upgrade/packages.yml +++ b/playbooks/manual/upgrade/packages.yml @@ -8,7 +8,7 @@ vars: testing: False handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - name: clean all metadata {%if testing%}(with infrastructure-testing on){%endif%} @@ -29,7 +29,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush diff --git a/playbooks/manual/upgrade/pagure.yml b/playbooks/manual/upgrade/pagure.yml index 79d109cd4d..ecfb26d1ec 100644 --- a/playbooks/manual/upgrade/pagure.yml +++ b/playbooks/manual/upgrade/pagure.yml @@ -12,7 +12,7 @@ vars: testing: False handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush w.r.t. the frontend diff --git a/playbooks/manual/upgrade/pdc.yml b/playbooks/manual/upgrade/pdc.yml index c6c0ad5117..1443d63a96 100644 --- a/playbooks/manual/upgrade/pdc.yml +++ b/playbooks/manual/upgrade/pdc.yml @@ -6,7 +6,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" pre_tasks: - name: clean all metadata @@ -38,7 +38,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" pre_tasks: - name: clean all metadata @@ -78,7 +78,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - name: And... start the backend again diff --git a/playbooks/manual/upgrade/statscache.yml b/playbooks/manual/upgrade/statscache.yml index 9743e67214..c004be6699 100644 --- a/playbooks/manual/upgrade/statscache.yml +++ b/playbooks/manual/upgrade/statscache.yml @@ -8,7 +8,7 @@ vars: testing: False handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - name: clean all metadata {%if testing%}(with infrastructure-testing on){%endif%} @@ -29,7 +29,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush w.r.t. the frontend @@ -51,7 +51,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush w.r.t. the backend @@ -88,7 +88,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - service: name="httpd" state=started diff --git a/playbooks/manual/upgrade/tagger.yml b/playbooks/manual/upgrade/tagger.yml index 00d142a9f6..eb7680c349 100644 --- a/playbooks/manual/upgrade/tagger.yml +++ b/playbooks/manual/upgrade/tagger.yml @@ -8,7 +8,7 @@ vars: testing: False handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" tasks: - name: clean all metadata {%if testing%}(with infrastructure-testing on){%endif%} @@ -29,7 +29,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include_tasks: "{{ handlers_path }}/restart_services.yml" + - import_tasks: "{{ handlers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush diff --git a/playbooks/restart_unbound.yml b/playbooks/restart_unbound.yml index ac03acd9ab..782b14e14c 100644 --- a/playbooks/restart_unbound.yml +++ b/playbooks/restart_unbound.yml @@ -13,4 +13,4 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - - include_tasks: "{{ tasks_path }}/restart_unbound.yml" + - import_tasks: "{{ tasks_path }}/restart_unbound.yml" diff --git a/playbooks/transient_cloud_instance.yml b/playbooks/transient_cloud_instance.yml index b537f1c8d9..3f4682823f 100644 --- a/playbooks/transient_cloud_instance.yml +++ b/playbooks/transient_cloud_instance.yml @@ -43,7 +43,7 @@ fail: msg="Please specify the name of the instance" when: name is not defined - - include_tasks: "{{ tasks_path }}/transient_cloud.yml" + - import_tasks: "{{ tasks_path }}/transient_cloud.yml" - name: gather facts setup: @@ -75,7 +75,7 @@ command: dnf install -y cloud-utils when: ansible_distribution_major_version|int > 21 and ansible_cmdline.ostree is not defined - - include_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" + - import_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/vhost_reboot.yml b/playbooks/vhost_reboot.yml index 6da07e2736..320e190dff 100644 --- a/playbooks/vhost_reboot.yml +++ b/playbooks/vhost_reboot.yml @@ -116,7 +116,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - - include_tasks: "{{ tasks_path }}/restart_unbound.yml" + - import_tasks: "{{ tasks_path }}/restart_unbound.yml" # - name: get info on guests (postreboot) # virt: command=info diff --git a/roles/abrt/faf-local/tasks/main.yml b/roles/abrt/faf-local/tasks/main.yml index 5252a9406a..b33fbfd59a 100644 --- a/roles/abrt/faf-local/tasks/main.yml +++ b/roles/abrt/faf-local/tasks/main.yml @@ -1,12 +1,12 @@ --- # Install additional packages -- include_tasks: install.yml +- import_tasks: install.yml # Create database for faf -- include_tasks: setup_db.yml +- import_tasks: setup_db.yml # Allow https and start httpd -- include_tasks: services.yml +- import_tasks: services.yml # landing page - name: install abrt-server-info-page @@ -79,5 +79,5 @@ tags: add_repo with_items: "{{ faf_repos }}" -- include_tasks: cron.yml +- import_tasks: cron.yml tags: cron diff --git a/roles/abrt/faf/tasks/main.yml b/roles/abrt/faf/tasks/main.yml index 28c2ed28a6..ab64a30865 100644 --- a/roles/abrt/faf/tasks/main.yml +++ b/roles/abrt/faf/tasks/main.yml @@ -1,32 +1,32 @@ -- include_tasks: install.yml +- import_tasks: install.yml tags: [faf, faf_install, packages] -- include_tasks: update.yml +- import_tasks: update.yml when: faf_update tags: [faf, faf_update, packages] -- include_tasks: first_time_setup.yml +- import_tasks: first_time_setup.yml tags: [faf, faf_fist_time_setup, config] -- include_tasks: config.yml +- import_tasks: config.yml tags: [faf, faf_config, config] -- include_tasks: migrate_db.yml +- import_tasks: migrate_db.yml when: faf_migrate_db tags: [faf, faf_migrate_db] -- include_tasks: cron.yml +- import_tasks: cron.yml when: faf_cron_jobs tags: [faf, config] -- include_tasks: web.yml +- import_tasks: web.yml when: faf_with_web tags: [faf, faf_web] -- include_tasks: check.yml +- import_tasks: check.yml when: faf_check tags: [faf, faf_check] -- include_tasks: check_web.yml +- import_tasks: check_web.yml when: faf_check_web tags: [faf, faf_check_web] diff --git a/roles/abrt/faf/tasks/web.yml b/roles/abrt/faf/tasks/web.yml index 175bd2068b..5a42615a51 100644 --- a/roles/abrt/faf/tasks/web.yml +++ b/roles/abrt/faf/tasks/web.yml @@ -11,7 +11,7 @@ yum : name={{ item }} state=latest with_items: "{{ faf_web_packages }}" -- include_tasks: celery.yml +- import_tasks: celery.yml when: faf_with_celery - name: install faf web symboltransfer packages diff --git a/roles/abrt/retrace-local/tasks/main.yml b/roles/abrt/retrace-local/tasks/main.yml index 55a97c19c1..1b06bcbe42 100644 --- a/roles/abrt/retrace-local/tasks/main.yml +++ b/roles/abrt/retrace-local/tasks/main.yml @@ -1,8 +1,8 @@ --- # Setup retrace-server -- include_tasks: retrace_setup.yml +- import_tasks: retrace_setup.yml # Set up cron jobs for retrace-server -- include_tasks: cron.yml +- import_tasks: cron.yml tags: cron diff --git a/roles/abrt/retrace/tasks/main.yml b/roles/abrt/retrace/tasks/main.yml index 1656a0917f..9b6d63e222 100644 --- a/roles/abrt/retrace/tasks/main.yml +++ b/roles/abrt/retrace/tasks/main.yml @@ -1,18 +1,18 @@ --- # Install retrace-server packages -- include_tasks: install.yml +- import_tasks: install.yml tags: [rs, packages] # Set up use of FAF packages -- include_tasks: usefafpkgs.yml +- import_tasks: usefafpkgs.yml when: rs_use_faf_packages tags: [rs, use_faf_packages] # Configure retrace-server -- include_tasks: config.yml +- import_tasks: config.yml tags: [rs, config] # Check functionality of the retrace-server -- include_tasks: check.yml +- import_tasks: check.yml when: rs_check_health tags: [rs, check] diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml index 31d98d3d41..45f80a8091 100644 --- a/roles/base/tasks/main.yml +++ b/roles/base/tasks/main.yml @@ -335,7 +335,7 @@ - rsyslog-audit - name: Setup postfix - include_tasks: postfix.yml + import_tasks: postfix.yml # # This task installs some common scripts to /usr/local/bin @@ -379,7 +379,7 @@ # Watchdog stuff # - name: Set up watchdog - include_tasks: watchdog.yml + import_tasks: watchdog.yml #Set PS1 to show stage environment at PS1 @@ -430,4 +430,4 @@ - krb5 - name: Setup host keytab - include_tasks: keytab.yml + import_tasks: keytab.yml diff --git a/roles/beaker/server/tasks/main.yml b/roles/beaker/server/tasks/main.yml index e9f7b5b6c6..3d6eb896ab 100644 --- a/roles/beaker/server/tasks/main.yml +++ b/roles/beaker/server/tasks/main.yml @@ -119,7 +119,7 @@ tags: - beaker-server -- include_tasks: client.yml +- import_tasks: client.yml - name: ensure beaker server has all relevant virthost ssh signatures in known_hosts lineinfile: dest=/root/.ssh/known_hosts regexp='{{ item.hostname }}' line='{{ item.hostname }} {{ item.signature }}' create=yes owner=root group=root diff --git a/roles/copr/backend/tasks/main.yml b/roles/copr/backend/tasks/main.yml index 2de3ba516c..35aaaf7a00 100644 --- a/roles/copr/backend/tasks/main.yml +++ b/roles/copr/backend/tasks/main.yml @@ -1,9 +1,9 @@ --- - name: mount fs - include_tasks: "mount_fs.yml" + import_tasks: "mount_fs.yml" - name: setup networking - include_tasks: "network.yml" + import_tasks: "network.yml" # pre-create copr user and group with predefined uid and gid - group: name=copr gid=986 @@ -82,7 +82,7 @@ - name: install certificates for production when: not devel - include_tasks: "install_certs.yml" + import_tasks: "install_certs.yml" - name: allow lighttpd set fds limit seboolean: name=httpd_setrlimit state=yes persistent=yes @@ -167,7 +167,7 @@ - name: install cert to access fed-cloud09 # TODO: remove this when fed-cloud09 receives external cert - include_tasks: install_cloud_cert.yml + import_tasks: install_cloud_cert.yml - name: enable and run copr-backend services service: name="{{ item }}" enabled=yes state=started @@ -184,8 +184,8 @@ copy: src="logrotate/lighttpd" dest=/etc/logrotate.d/lighttpd owner=root group=root mode=644 - name: setup monitoring - include_tasks: "monitoring.yml" + import_tasks: "monitoring.yml" - name: setup fedmsg for MBS - include_tasks: "fedmsg.yml" + import_tasks: "fedmsg.yml" when: env == "staging" diff --git a/roles/copr/base/tasks/main.yml b/roles/copr/base/tasks/main.yml index ef43446e9e..01557619b8 100644 --- a/roles/copr/base/tasks/main.yml +++ b/roles/copr/base/tasks/main.yml @@ -4,9 +4,9 @@ # again to late to do it here -# - include_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" +# - import_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" # already included into the `base` role -#- include_tasks: "{{ tasks_path }}/postfix_basic.yml" +#- import_tasks: "{{ tasks_path }}/postfix_basic.yml" # To late to do it here ( #- name: setup correct hostname for copr machine diff --git a/roles/copr/dist_git/tasks/main.yml b/roles/copr/dist_git/tasks/main.yml index e0b65be087..f22a6d0864 100644 --- a/roles/copr/dist_git/tasks/main.yml +++ b/roles/copr/dist_git/tasks/main.yml @@ -1,4 +1,4 @@ -- include_tasks: "mount_fs.yml" +- import_tasks: "mount_fs.yml" # pre-create users/groups and copy uids/gids from the current prod copr-dist-git - group: name="packager" state=present gid=987 diff --git a/roles/copr/frontend/tasks/main.yml b/roles/copr/frontend/tasks/main.yml index 7129630567..9f9e23c53c 100644 --- a/roles/copr/frontend/tasks/main.yml +++ b/roles/copr/frontend/tasks/main.yml @@ -1,5 +1,5 @@ --- -- include_tasks: "mount_fs.yml" +- import_tasks: "mount_fs.yml" - command: "ls -dZ /var/lib/pgsql" register: pgsql_ls @@ -58,7 +58,7 @@ tags: - config -- include_tasks: "psql_setup.yml" +- import_tasks: "psql_setup.yml" - name: upgrade db to head command: alembic upgrade head @@ -89,7 +89,7 @@ chdir: /usr/share/copr/coprs_frontend/ - name: install ssl certificates for production - include_tasks: "install_certs.yml" + import_tasks: "install_certs.yml" when: not devel tags: - config diff --git a/roles/copr/keygen/tasks/main.yml b/roles/copr/keygen/tasks/main.yml index 391213fbf0..1390f01494 100644 --- a/roles/copr/keygen/tasks/main.yml +++ b/roles/copr/keygen/tasks/main.yml @@ -56,4 +56,4 @@ - name: setup backup when: not devel - include_tasks: "setup_backup.yml" + import_tasks: "setup_backup.yml" diff --git a/roles/hubs/handlers/main.yml b/roles/hubs/handlers/main.yml index 870ea50752..c6935af51c 100644 --- a/roles/hubs/handlers/main.yml +++ b/roles/hubs/handlers/main.yml @@ -18,4 +18,4 @@ listen: "hubs configuration change" # Webserver -- include_tasks: webserver.yml +- import_tasks: webserver.yml diff --git a/roles/hubs/tasks/main.yml b/roles/hubs/tasks/main.yml index 4ea2dc7456..990aed7dd4 100644 --- a/roles/hubs/tasks/main.yml +++ b/roles/hubs/tasks/main.yml @@ -145,7 +145,7 @@ # Set up, create, and populate the database. -- include_tasks: db-{{ hubs_db_type }}.yml +- import_tasks: db-{{ hubs_db_type }}.yml # Set up JavaScript requirements @@ -196,5 +196,5 @@ # Webserver -- include_tasks: webserver.yml +- import_tasks: webserver.yml when: not hubs_dev_mode diff --git a/roles/nginx/tasks/main.yml b/roles/nginx/tasks/main.yml index fe0ce523de..c167777a4b 100644 --- a/roles/nginx/tasks/main.yml +++ b/roles/nginx/tasks/main.yml @@ -1,5 +1,5 @@ --- -- include_tasks: nginx.yml +- import_tasks: nginx.yml -- include_tasks: ssl-setup.yml +- import_tasks: ssl-setup.yml when: not httpd_no_ssl diff --git a/roles/openqa/worker/tasks/main.yml b/roles/openqa/worker/tasks/main.yml index 831ff77e81..9807ee3730 100644 --- a/roles/openqa/worker/tasks/main.yml +++ b/roles/openqa/worker/tasks/main.yml @@ -50,10 +50,10 @@ service: name=openqa-ppc64-prep enabled=yes state=started when: "ansible_architecture is defined and ansible_architecture == 'ppc64le'" -- include_tasks: nfs-client.yml +- import_tasks: nfs-client.yml when: openqa_hostname is defined and openqa_hostname != "localhost" -- include_tasks: tap-setup.yml +- import_tasks: tap-setup.yml when: openqa_tap is defined and openqa_tap - name: openQA client config @@ -66,7 +66,7 @@ tags: - config -- include_tasks: createhdds.yml +- import_tasks: createhdds.yml when: "inventory_hostname in groups['openqa-hdds-workers']" - name: Enable and start worker services diff --git a/roles/osbs-atomic-reactor/tasks/main.yml b/roles/osbs-atomic-reactor/tasks/main.yml index 8d035cdc97..8e48578c3a 100644 --- a/roles/osbs-atomic-reactor/tasks/main.yml +++ b/roles/osbs-atomic-reactor/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include_tasks: source_{{ atomic_reactor_source }}.yml +- import_tasks: source_{{ atomic_reactor_source }}.yml diff --git a/roles/osbs-namespace/tasks/main.yml b/roles/osbs-namespace/tasks/main.yml index 0f66f1a21c..af6a4fd1d0 100644 --- a/roles/osbs-namespace/tasks/main.yml +++ b/roles/osbs-namespace/tasks/main.yml @@ -188,5 +188,5 @@ tags: - oc -- include_tasks: orchestrator.yml +- import_tasks: orchestrator.yml when: osbs_orchestrator diff --git a/roles/osbs-on-openshift/tasks/main.yml b/roles/osbs-on-openshift/tasks/main.yml index cf2482fa62..228008a873 100644 --- a/roles/osbs-on-openshift/tasks/main.yml +++ b/roles/osbs-on-openshift/tasks/main.yml @@ -134,8 +134,8 @@ tags: - oc -- include_tasks: yum_proxy.yml +- import_tasks: yum_proxy.yml when: osbs_yum_proxy_image is defined -- include_tasks: registry.yml +- import_tasks: registry.yml when: osbs_docker_registry is defined and osbs_docker_registry diff --git a/roles/waiverdb/tasks/main.yml b/roles/waiverdb/tasks/main.yml index bf4eee39df..d7c4049bb5 100644 --- a/roles/waiverdb/tasks/main.yml +++ b/roles/waiverdb/tasks/main.yml @@ -1,5 +1,5 @@ --- -- include_tasks: psql_setup.yml +- import_tasks: psql_setup.yml # Need to set selinux to permissive for now due to https://bugzilla.redhat.com/show_bug.cgi?id=1291940 - name: switch selinux to permissive