diff options
| author | Kevin Fenzi <kevin@scrye.com> | 2017-04-13 15:46:14 +0000 |
|---|---|---|
| committer | Kevin Fenzi <kevin@scrye.com> | 2017-04-13 15:46:14 +0000 |
| commit | 0acfaa2a7e36c30c5f8ceb4af4532e6791a2a3e7 (patch) | |
| tree | c324a3836fce37f90c7ef090c2cf68d9c9d36538 | |
| parent | 87a32844b16cfca381b1122a4dd405144524857f (diff) | |
| download | ansible-0acfaa2a7e36c30c5f8ceb4af4532e6791a2a3e7.tar.gz ansible-0acfaa2a7e36c30c5f8ceb4af4532e6791a2a3e7.tar.xz ansible-0acfaa2a7e36c30c5f8ceb4af4532e6791a2a3e7.zip | |
Fix handlers, roles, and tasks to be handlers_path, roles_path and tasks_path so as not to conflict with ansible variables.
Fix duplicate definition of become default that was in group_vars/all as well as vars/global.
207 files changed, 785 insertions, 788 deletions
diff --git a/playbooks/check-host.yml b/playbooks/check-host.yml index 56d9b27ce..ccb4cf634 100644 --- a/playbooks/check-host.yml +++ b/playbooks/check-host.yml @@ -265,5 +265,5 @@ # handlers: -# - include: "{{ handlers }}/restart_services.yml" +# - include: "{{ handlers_path }}/restart_services.yml" # - include: "restart_services.yml" diff --git a/playbooks/cloud_prep.yml b/playbooks/cloud_prep.yml index 744e5ab39..74420b813 100644 --- a/playbooks/cloud_prep.yml +++ b/playbooks/cloud_prep.yml @@ -7,8 +7,8 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - - include: "{{ tasks }}/cloud_setup_basic.yml" + - include: "{{ tasks_path }}/cloud_setup_basic.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/anitya.yml b/playbooks/groups/anitya.yml index 3d290d46a..3809bd967 100644 --- a/playbooks/groups/anitya.yml +++ b/playbooks/groups/anitya.yml @@ -22,12 +22,12 @@ - openvpn/client tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: set up the frontend bits hosts: anitya-frontend @@ -56,7 +56,7 @@ - anitya handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: set up the backend bits hosts: anitya-backend @@ -76,4 +76,4 @@ - anitya handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/arm-qa.yml b/playbooks/groups/arm-qa.yml index 864bab27e..f97485a94 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 }}/yumrepos.yml" + - include: "{{ tasks_path }}/yumrepos.yml" roles: - base @@ -23,7 +23,7 @@ tasks: # this is how you include other task lists - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/ask.yml b/playbooks/groups/ask.yml index ddb946838..2fc89b60e 100644 --- a/playbooks/groups/ask.yml +++ b/playbooks/groups/ask.yml @@ -26,12 +26,12 @@ when: env != "staging" } tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: set up gluster on stg hosts: ask-stg diff --git a/playbooks/groups/autocloud-backend.yml b/playbooks/groups/autocloud-backend.yml index adbbed5d9..1924baf9e 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 }}/yumrepos.yml" + - include: "{{ tasks_path }}/yumrepos.yml" roles: - base @@ -24,11 +24,11 @@ - sudo tasks: - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: dole out the service-specific config hosts: autocloud-backend:autocloud-backend-stg @@ -39,7 +39,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" roles: - redis diff --git a/playbooks/groups/autocloud-web.yml b/playbooks/groups/autocloud-web.yml index 018ec2235..5554da6a9 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 }}/yumrepos.yml" + - include: "{{ tasks_path }}/yumrepos.yml" roles: - base @@ -27,11 +27,11 @@ when: env != "staging" tasks: - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: dole out the app-specific configuration hosts: autocloud-web:autocloud-web-stg @@ -43,7 +43,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" roles: - autocloud/frontend diff --git a/playbooks/groups/backup-server.yml b/playbooks/groups/backup-server.yml index 6097fc970..353b43c2d 100644 --- a/playbooks/groups/backup-server.yml +++ b/playbooks/groups/backup-server.yml @@ -28,10 +28,10 @@ - openvpn/client tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/rdiff_backup_server.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" + - include: "{{ tasks_path }}/rdiff_backup_server.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/badges-backend.yml b/playbooks/groups/badges-backend.yml index a9002f914..e519c76e2 100644 --- a/playbooks/groups/badges-backend.yml +++ b/playbooks/groups/badges-backend.yml @@ -28,12 +28,12 @@ when: env != "staging" } tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: dole out the service-specific config hosts: badges-backend:badges-backend-stg @@ -52,4 +52,4 @@ - "{{ vars_path }}/{{ ansible_distribution }}.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/badges-web.yml b/playbooks/groups/badges-web.yml index 02639fd7d..ffa446705 100644 --- a/playbooks/groups/badges-web.yml +++ b/playbooks/groups/badges-web.yml @@ -39,9 +39,9 @@ interval: 10 tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/basset.yml b/playbooks/groups/basset.yml index baa9991dc..cdf511aa9 100644 --- a/playbooks/groups/basset.yml +++ b/playbooks/groups/basset.yml @@ -30,9 +30,9 @@ - basset/worker tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/bastion.yml b/playbooks/groups/bastion.yml index 185f7b21a..6e02bc709 100644 --- a/playbooks/groups/bastion.yml +++ b/playbooks/groups/bastion.yml @@ -23,12 +23,12 @@ - opendkim tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: configure bastion-qa hosts: bastion-comm01.qa.fedoraproject.org diff --git a/playbooks/groups/batcave.yml b/playbooks/groups/batcave.yml index 516d43a49..cbd3abdb4 100644 --- a/playbooks/groups/batcave.yml +++ b/playbooks/groups/batcave.yml @@ -34,9 +34,9 @@ - { role: nfs/client, mnt_dir: '/mnt/fedora/app', nfs_src_dir: 'fedora_app/app' } tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/beaker-virthosts.yml b/playbooks/groups/beaker-virthosts.yml index 49054a11c..856ee8540 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 }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/beaker.yml b/playbooks/groups/beaker.yml index 67a8ea55a..13c4b9655 100644 --- a/playbooks/groups/beaker.yml +++ b/playbooks/groups/beaker.yml @@ -28,12 +28,12 @@ tasks: # this is how you include other task lists - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: configure beaker and required services hosts: beaker:beaker-stg @@ -52,5 +52,5 @@ - { role: beaker/labcontroller, tags: ['beakerlabcontroller'] } handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/blockerbugs.yml b/playbooks/groups/blockerbugs.yml index 48d0474f1..e80a76a11 100644 --- a/playbooks/groups/blockerbugs.yml +++ b/playbooks/groups/blockerbugs.yml @@ -26,9 +26,9 @@ - blockerbugs tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/bodhi-backend.yml b/playbooks/groups/bodhi-backend.yml index c88b01b12..fff3efc7e 100644 --- a/playbooks/groups/bodhi-backend.yml +++ b/playbooks/groups/bodhi-backend.yml @@ -74,9 +74,9 @@ file: src=/mnt/fedora_koji_prod/koji dest=/mnt/koji/vol/prod state=link tags: bodhi when: env == 'staging' - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/bodhi2.yml b/playbooks/groups/bodhi2.yml index 33790e02b..0abce785e 100644 --- a/playbooks/groups/bodhi2.yml +++ b/playbooks/groups/bodhi2.yml @@ -41,9 +41,9 @@ - { role: fedmsg/base, when: "inventory_hostname.startswith('bodhi0')" } tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/bugyou.yml b/playbooks/groups/bugyou.yml index 8a9da36a8..399f3aaec 100644 --- a/playbooks/groups/bugyou.yml +++ b/playbooks/groups/bugyou.yml @@ -25,12 +25,12 @@ - sudo tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: set up fedmsg basics hosts: bugyou:bugyou-stg @@ -46,7 +46,7 @@ - fedmsg/base handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: dole out the service-specific config hosts: bugyou:bugyou-stg @@ -66,4 +66,4 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/bugzilla2fedmsg.yml b/playbooks/groups/bugzilla2fedmsg.yml index 28d88ebdc..06e073e34 100644 --- a/playbooks/groups/bugzilla2fedmsg.yml +++ b/playbooks/groups/bugzilla2fedmsg.yml @@ -26,12 +26,12 @@ - fedmsg/base tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: dole out the service-specific config hosts: bugzilla2fedmsg:bugzilla2fedmsg-stg @@ -49,4 +49,4 @@ - "{{ vars_path }}/{{ ansible_distribution }}.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/buildhw.yml b/playbooks/groups/buildhw.yml index 74a148024..29893d3e7 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 }}/yumrepos.yml" - - include: "{{ tasks }}/osbs_certs.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/osbs_certs.yml" roles: - base @@ -29,13 +29,13 @@ service: compile tasks: - - include: "{{ tasks }}/2fa_client.yml" + - include: "{{ tasks_path }}/2fa_client.yml" when: not inventory_hostname.startswith('bkernel') - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/motd.yml" when: not inventory_hostname.startswith('bkernel') - name: make sure kojid is running service: name=kojid state=started enabled=yes handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/buildvm.yml b/playbooks/groups/buildvm.yml index 91003df51..0f6ff71a3 100644 --- a/playbooks/groups/buildvm.yml +++ b/playbooks/groups/buildvm.yml @@ -16,7 +16,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks }}/yumrepos.yml" + - include: "{{ tasks_path }}/yumrepos.yml" roles: - base @@ -43,9 +43,9 @@ when: env == "staging" tasks: - - include: "{{ tasks }}/2fa_client.yml" + - include: "{{ tasks_path }}/2fa_client.yml" when: not inventory_hostname.startswith('bkernel') - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/motd.yml" when: not inventory_hostname.startswith('bkernel') - name: make sure httpd is running @@ -55,7 +55,7 @@ service: name=kojid state=started enabled=yes handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: configure osbs on koji builders hosts: buildvm:buildvm-stg @@ -70,8 +70,8 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks }}/osbs_certs.yml" - - include: "{{ tasks }}/osbs_repos.yml" + - include: "{{ tasks_path }}/osbs_certs.yml" + - include: "{{ tasks_path }}/osbs_repos.yml" roles: - { @@ -140,4 +140,4 @@ } handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/busgateway.yml b/playbooks/groups/busgateway.yml index 4a16bb4a0..00cb88c2c 100644 --- a/playbooks/groups/busgateway.yml +++ b/playbooks/groups/busgateway.yml @@ -23,12 +23,12 @@ when: env != "staging" } tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: dole out the service-specific config hosts: busgateway:busgateway-stg @@ -55,4 +55,4 @@ - "{{ vars_path }}/{{ ansible_distribution }}.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/copr-backend.yml b/playbooks/groups/copr-backend.yml index 82d5fd74c..42c43a258 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 }}/persistent_cloud.yml" + - include: "{{ tasks_path }}/persistent_cloud.yml" - name: cloud basic setup hosts: copr-back:copr-back-stg @@ -21,7 +21,7 @@ - /srv/private/ansible/vars.yml tasks: - - include: "{{ tasks }}/cloud_setup_basic.yml" + - include: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{copr_hostbase}}.cloud.fedoraproject.org" diff --git a/playbooks/groups/copr-dist-git.yml b/playbooks/groups/copr-dist-git.yml index b1b23db68..2ee38dbb3 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 }}/persistent_cloud.yml" + - include: "{{ tasks_path }}/persistent_cloud.yml" - name: cloud basic setup hosts: copr-dist-git-stg:copr-dist-git @@ -21,7 +21,7 @@ - "/srv/private/ansible/vars.yml" tasks: - - include: "{{ tasks }}/cloud_setup_basic.yml" + - include: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{copr_hostbase}}.cloud.fedoraproject.org" diff --git a/playbooks/groups/copr-frontend.yml b/playbooks/groups/copr-frontend.yml index f3cbe7fc7..7624527f0 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 }}/persistent_cloud.yml" + - include: "{{ tasks_path }}/persistent_cloud.yml" - name: cloud basic setup hosts: copr-front-stg:copr-front @@ -21,7 +21,7 @@ - "/srv/private/ansible/vars.yml" tasks: - - include: "{{ tasks }}/cloud_setup_basic.yml" + - include: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{copr_hostbase}}.cloud.fedoraproject.org" diff --git a/playbooks/groups/copr-keygen.yml b/playbooks/groups/copr-keygen.yml index 204da5b19..279f1dc4f 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 }}/persistent_cloud.yml" + - include: "{{ tasks_path }}/persistent_cloud.yml" - name: gather facts setup: check_mode: no @@ -29,7 +29,7 @@ - "/srv/private/ansible/vars.yml" tasks: - - include: "{{ tasks }}/cloud_setup_basic.yml" + - include: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{copr_hostbase}}.cloud.fedoraproject.org" diff --git a/playbooks/groups/darkserver-backend.yml b/playbooks/groups/darkserver-backend.yml index cad27ba3c..669404157 100644 --- a/playbooks/groups/darkserver-backend.yml +++ b/playbooks/groups/darkserver-backend.yml @@ -31,12 +31,12 @@ - role: apache tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: set up fedmsg basics hosts: darkserver-backend:darkserver-backend-stg @@ -52,7 +52,7 @@ - fedmsg/base handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: dole out the service-specific config hosts: darkserver-backend:darkserver-backend-stg @@ -71,4 +71,4 @@ process: fedmsg-hub handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/darkserver-web.yml b/playbooks/groups/darkserver-web.yml index 036e1529f..ddc4d419a 100644 --- a/playbooks/groups/darkserver-web.yml +++ b/playbooks/groups/darkserver-web.yml @@ -31,10 +31,10 @@ - darkserver/web tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/darkserver.yml b/playbooks/groups/darkserver.yml index 652949ab1..1d8f180a4 100644 --- a/playbooks/groups/darkserver.yml +++ b/playbooks/groups/darkserver.yml @@ -32,9 +32,9 @@ - darkserver tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/datagrepper.yml b/playbooks/groups/datagrepper.yml index 405081236..5f19fe3b0 100644 --- a/playbooks/groups/datagrepper.yml +++ b/playbooks/groups/datagrepper.yml @@ -27,12 +27,12 @@ - mod_wsgi tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: dole out the service-specific config hosts: datagrepper:datagrepper-stg @@ -52,7 +52,7 @@ interval: 15 handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" # The gluster work here can be omitted for now. It is used by a feature of # datagrepper that is partially in place, but not yet functional. @@ -77,7 +77,7 @@ # datadir: /srv/glusterfs/datagrepper # # handlers: -# - include: "{{ handlers }}/restart_services.yml" +# - include: "{{ handlers_path }}/restart_services.yml" # #- name: set up gluster client on prod # hosts: datagrepper:datagrepper-stg @@ -102,4 +102,4 @@ # mountdir: /var/cache/datagrepper # # handlers: -# - include: "{{ handlers }}/restart_services.yml" +# - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/dhcp.yml b/playbooks/groups/dhcp.yml index 55f25723d..2a2074135 100644 --- a/playbooks/groups/dhcp.yml +++ b/playbooks/groups/dhcp.yml @@ -22,9 +22,9 @@ - tftp_server tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/dns.yml b/playbooks/groups/dns.yml index d232a6fe6..46a6b89e8 100644 --- a/playbooks/groups/dns.yml +++ b/playbooks/groups/dns.yml @@ -26,9 +26,9 @@ - dns tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/docker-registry.yml b/playbooks/groups/docker-registry.yml index 4171f08f1..257c1961b 100644 --- a/playbooks/groups/docker-registry.yml +++ b/playbooks/groups/docker-registry.yml @@ -24,12 +24,12 @@ when: env != "staging" } tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: set up gluster on stg hosts: diff --git a/playbooks/groups/download.yml b/playbooks/groups/download.yml index 24933edd2..e82b86dff 100644 --- a/playbooks/groups/download.yml +++ b/playbooks/groups/download.yml @@ -13,7 +13,7 @@ tasks: handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: post-initial-steps @@ -44,9 +44,9 @@ - { role: openvpn/client, when: datacenter != "phx2" } tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" - name: put in script for syncing on download-ib01 copy: src="{{ files }}/download/sync-up-downloads.sh.ib01" dest=/usr/local/bin/sync-up-downloads owner=root group=root mode=755 @@ -68,5 +68,5 @@ handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/elections.yml b/playbooks/groups/elections.yml index 2d9eb68e8..6e11e652f 100644 --- a/playbooks/groups/elections.yml +++ b/playbooks/groups/elections.yml @@ -24,12 +24,12 @@ - collectd/base tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: set up fedmsg on elections hosts: elections:elections-stg @@ -45,7 +45,7 @@ - fedmsg/base handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: deploy elections itself hosts: elections:elections-stg @@ -61,5 +61,5 @@ - elections handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/fas.yml b/playbooks/groups/fas.yml index 98f4ded9f..6d6b13f4a 100644 --- a/playbooks/groups/fas.yml +++ b/playbooks/groups/fas.yml @@ -30,9 +30,9 @@ - { role: openvpn/client, when: env != "staging" } tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/fas3.yml b/playbooks/groups/fas3.yml index 6c2455e38..6bef9f552 100644 --- a/playbooks/groups/fas3.yml +++ b/playbooks/groups/fas3.yml @@ -30,9 +30,9 @@ #- { role: openvpn/client, when: env != "staging" } tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/fedimg.yml b/playbooks/groups/fedimg.yml index 9e166ad19..92743c962 100644 --- a/playbooks/groups/fedimg.yml +++ b/playbooks/groups/fedimg.yml @@ -28,12 +28,12 @@ # when: env != "staging" } tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: dole out the service-specific config hosts: fedimg:fedimg-stg @@ -61,4 +61,4 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/fedocal.yml b/playbooks/groups/fedocal.yml index 300e8b66c..6d4cbb669 100644 --- a/playbooks/groups/fedocal.yml +++ b/playbooks/groups/fedocal.yml @@ -24,12 +24,12 @@ - collectd/base tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: set up fedmsg hosts: fedocal-stg:fedocal @@ -45,7 +45,7 @@ - fedmsg/base handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: deploy fedocal itself hosts: fedocal-stg:fedocal @@ -61,4 +61,4 @@ - fedocal handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/github2fedmsg.yml b/playbooks/groups/github2fedmsg.yml index c6b950e14..89bb97aae 100644 --- a/playbooks/groups/github2fedmsg.yml +++ b/playbooks/groups/github2fedmsg.yml @@ -29,12 +29,12 @@ - mod_wsgi tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: deploy service-specific config hosts: github2fedmsg:github2fedmsg-stg @@ -47,7 +47,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" roles: - github2fedmsg diff --git a/playbooks/groups/gnome-backups.yml b/playbooks/groups/gnome-backups.yml index 765ef69d7..48b007093 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 }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/hosted.yml b/playbooks/groups/hosted.yml index 5679dd233..a3a9536b2 100644 --- a/playbooks/groups/hosted.yml +++ b/playbooks/groups/hosted.yml @@ -21,9 +21,9 @@ - openvpn/client tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/hotness.yml b/playbooks/groups/hotness.yml index c9de390ea..a863f2ef7 100644 --- a/playbooks/groups/hotness.yml +++ b/playbooks/groups/hotness.yml @@ -32,12 +32,12 @@ # when: env != "staging" } tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: set up fedmsg basics hosts: hotness:hotness-stg @@ -53,7 +53,7 @@ - fedmsg/base handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: dole out the service-specific config hosts: hotness:hotness-stg @@ -72,4 +72,4 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/infinote.yml b/playbooks/groups/infinote.yml index c095f394a..f066188f3 100644 --- a/playbooks/groups/infinote.yml +++ b/playbooks/groups/infinote.yml @@ -29,9 +29,9 @@ - infinote tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/ipa.yml b/playbooks/groups/ipa.yml index edb1bc022..b6682a287 100644 --- a/playbooks/groups/ipa.yml +++ b/playbooks/groups/ipa.yml @@ -23,12 +23,12 @@ - mod_wsgi tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: deploy ipa itself hosts: ipa:ipa-stg @@ -51,7 +51,7 @@ - combine IPA http keytabs handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" tasks: - name: Combine IPA keytabs @@ -100,4 +100,4 @@ - base handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/ipsilon.yml b/playbooks/groups/ipsilon.yml index 3070ab664..77f7890a3 100644 --- a/playbooks/groups/ipsilon.yml +++ b/playbooks/groups/ipsilon.yml @@ -40,12 +40,12 @@ when: env == "production" tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: deploy ipsilon itself hosts: ipsilon:ipsilon-stg @@ -61,4 +61,4 @@ - ipsilon handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/jenkins-master.yml b/playbooks/groups/jenkins-master.yml index d79cee650..6eec92cd4 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 }}/persistent_cloud.yml" + - include: "{{ tasks_path }}/persistent_cloud.yml" - name: setup all the things hosts: jenkins-master @@ -21,10 +21,10 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks }}/cloud_setup_basic.yml" + - include: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" - - include: "{{ tasks }}/yumrepos.yml" + - include: "{{ tasks_path }}/yumrepos.yml" - name: provision instance hosts: jenkins-master @@ -41,8 +41,8 @@ - certbot tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/jenkins-slave.yml b/playbooks/groups/jenkins-slave.yml index 51a9c7087..0adfd4021 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 }}/persistent_cloud.yml" + - include: "{{ tasks_path }}/persistent_cloud.yml" - name: setup all the things hosts: jenkins-slave @@ -21,10 +21,10 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks }}/cloud_setup_basic.yml" + - include: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" - - include: "{{ tasks }}/yumrepos.yml" + - include: "{{ tasks_path }}/yumrepos.yml" - name: provision instance hosts: jenkins-slave @@ -39,9 +39,9 @@ - jenkins/slave tasks: -# - include: "{{ tasks }}/growroot_cloud.yml" - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/motd.yml" +# - include: "{{ tasks_path }}/growroot_cloud.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/kerneltest.yml b/playbooks/groups/kerneltest.yml index a665d5087..3dbccb652 100644 --- a/playbooks/groups/kerneltest.yml +++ b/playbooks/groups/kerneltest.yml @@ -29,12 +29,12 @@ - mod_wsgi tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: deploy service-specific config hosts: kerneltest-stg:kerneltest @@ -47,7 +47,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" roles: - kerneltest diff --git a/playbooks/groups/keyserver.yml b/playbooks/groups/keyserver.yml index 989a04538..740afa426 100644 --- a/playbooks/groups/keyserver.yml +++ b/playbooks/groups/keyserver.yml @@ -29,9 +29,9 @@ - keyserver tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/koji-hub.yml b/playbooks/groups/koji-hub.yml index 656ec6701..11c80d179 100644 --- a/playbooks/groups/koji-hub.yml +++ b/playbooks/groups/koji-hub.yml @@ -17,8 +17,8 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks }}/osbs_certs.yml" - - include: "{{ tasks }}/osbs_repos.yml" + - include: "{{ tasks_path }}/osbs_certs.yml" + - include: "{{ tasks_path }}/osbs_repos.yml" roles: - base @@ -82,12 +82,12 @@ file: src=/mnt/fedora_koji_prod/koji dest=/mnt/koji/vol/prod state=link tags: koji_hub when: env == 'staging' - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" #- name: Start the kojid builder daemon, but only on staging. diff --git a/playbooks/groups/kojipkgs.yml b/playbooks/groups/kojipkgs.yml index 484f02abd..4a6bfaf3f 100644 --- a/playbooks/groups/kojipkgs.yml +++ b/playbooks/groups/kojipkgs.yml @@ -32,9 +32,9 @@ - role: varnish tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/koschei-backend.yml b/playbooks/groups/koschei-backend.yml index 0204428e0..2d67ce986 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 }}/yumrepos.yml" + - include: "{{ tasks_path }}/yumrepos.yml" roles: - base @@ -31,8 +31,8 @@ - fedmsg/base tasks: - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/koschei-web.yml b/playbooks/groups/koschei-web.yml index 9314f5744..cd1c919c1 100644 --- a/playbooks/groups/koschei-web.yml +++ b/playbooks/groups/koschei-web.yml @@ -24,9 +24,9 @@ - koschei/frontend tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/logserver.yml b/playbooks/groups/logserver.yml index 036ee8aaf..362ef9153 100644 --- a/playbooks/groups/logserver.yml +++ b/playbooks/groups/logserver.yml @@ -31,9 +31,9 @@ when: env == "production" tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" # # We exclude some dirs from restorecon on updates on logservers as they are very large @@ -43,7 +43,7 @@ copy: src="{{ files }}/logserver/fixfiles_exclude_dirs" dest=/etc/selinux/fixfiles_exclude_dirs owner=root mode=0644 handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: Cloud Image stats hosts: log01.phx2.fedoraproject.org @@ -63,4 +63,4 @@ nfs_src_dir: 'fedora_stats' handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/loopabull.yml b/playbooks/groups/loopabull.yml index 03d0882cd..425953dd8 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 }}/yumrepos.yml" + - include: "{{ tasks_path }}/yumrepos.yml" roles: - base @@ -24,11 +24,11 @@ - sudo tasks: - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: Deploy and configure loopabull hosts: loopabull-stg diff --git a/playbooks/groups/mailman.yml b/playbooks/groups/mailman.yml index 882802271..1d70e5217 100644 --- a/playbooks/groups/mailman.yml +++ b/playbooks/groups/mailman.yml @@ -29,12 +29,12 @@ tasks: # this is how you include other task lists - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" # @@ -119,4 +119,4 @@ when: inventory_hostname.startswith('mailman01.phx2') or inventory_hostname.startswith('lists-dev') handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/maintainer-test.yml b/playbooks/groups/maintainer-test.yml index 83e86dd02..566ad58d6 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 }}/persistent_cloud.yml" + - include: "{{ tasks_path }}/persistent_cloud.yml" - name: Do some basic cloud setup on them hosts: maintainer-test @@ -21,7 +21,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks }}/cloud_setup_basic.yml" + - include: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" @@ -37,7 +37,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks }}/yumrepos.yml" + - include: "{{ tasks_path }}/yumrepos.yml" roles: - base @@ -48,7 +48,7 @@ tasks: # this is how you include other task lists - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/motd.yml" - name: install packager tools (dnf) dnf: state=present pkg={{ item }} @@ -68,4 +68,4 @@ - config handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/mariadb-server.yml b/playbooks/groups/mariadb-server.yml index 942287bbe..58814d37e 100644 --- a/playbooks/groups/mariadb-server.yml +++ b/playbooks/groups/mariadb-server.yml @@ -27,11 +27,11 @@ - sudo tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" # TODO: add iscsi task handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/mbs.yml b/playbooks/groups/mbs.yml index ef61b129d..365edb61d 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 }}/yumrepos.yml" + - include: "{{ tasks_path }}/yumrepos.yml" roles: - base @@ -24,11 +24,11 @@ - collectd/base tasks: - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: openvpn on the prod frontend nodes hosts: mbs-frontend @@ -44,7 +44,7 @@ - openvpn/client handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: Set up apache on the frontend MBS API app hosts: mbs-frontend:mbs-frontend-stg @@ -60,7 +60,7 @@ - mod_wsgi handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: set up fedmsg configuration and common mbs files hosts: mbs:mbs-stg @@ -77,7 +77,7 @@ - mbs/common handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: deploy the frontend MBS API app hosts: mbs-frontend:mbs-frontend-stg @@ -93,7 +93,7 @@ - mbs/frontend handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: deploy the backend MBS scheduler daemon hosts: mbs-backend:mbs-backend-stg @@ -119,4 +119,4 @@ #- mbs/backend handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/mdapi.yml b/playbooks/groups/mdapi.yml index d60b330d4..5d59f8b36 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 }}/yumrepos.yml" + - include: "{{ tasks_path }}/yumrepos.yml" roles: - base @@ -27,11 +27,11 @@ - { role: mod_wsgi, when: env == "staging" } tasks: - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: deploy mdapi itself hosts: mdapi-stg:mdapi @@ -48,7 +48,7 @@ - { role: plus-plus-service, when: env == "staging" } handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: set up fedmsg hosts: mdapi-stg:mdapi @@ -64,4 +64,4 @@ - fedmsg/base handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/memcached.yml b/playbooks/groups/memcached.yml index 0e0fea21e..f3660f2a3 100644 --- a/playbooks/groups/memcached.yml +++ b/playbooks/groups/memcached.yml @@ -22,9 +22,9 @@ - memcached tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/mirrorlist2.yml b/playbooks/groups/mirrorlist2.yml index 55a8c5a1e..68381419f 100644 --- a/playbooks/groups/mirrorlist2.yml +++ b/playbooks/groups/mirrorlist2.yml @@ -91,10 +91,10 @@ tasks: # this is how you include other task lists - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/mirrormanager.yml b/playbooks/groups/mirrormanager.yml index c535ad203..d48111021 100644 --- a/playbooks/groups/mirrormanager.yml +++ b/playbooks/groups/mirrormanager.yml @@ -22,12 +22,12 @@ - { role: nfs/client, when: inventory_hostname.startswith('mm-backend01'), mnt_dir: '/srv/pub', nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub' } tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: Deploy the backend hosts: mm-backend:mm-backend-stg @@ -45,7 +45,7 @@ - geoip handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: Deploy the crawler hosts: mm-crawler:mm-crawler-stg @@ -64,7 +64,7 @@ - { role: openvpn/client, when: datacenter != "phx2" } handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: Deploy the frontend (web-app) hosts: mm-frontend:mm-frontend-stg @@ -80,7 +80,7 @@ - mirrormanager/frontend2 handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" # Do this one last, since the mirrormanager user needs to exist so that it can # own the fedmsg certs we put in place here. @@ -98,4 +98,4 @@ - fedmsg/base handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/modernpaste.yml b/playbooks/groups/modernpaste.yml index 77a97f85a..1a28e4319 100644 --- a/playbooks/groups/modernpaste.yml +++ b/playbooks/groups/modernpaste.yml @@ -27,12 +27,12 @@ - { role: openvpn/client, when: env != "staging" } tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: dole out the service-specific config hosts: modernpaste-stg:modernpaste @@ -48,4 +48,4 @@ - "{{ vars_path }}/{{ ansible_distribution }}.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/nagios-new.yml b/playbooks/groups/nagios-new.yml index d8b8d3120..33327a36b 100644 --- a/playbooks/groups/nagios-new.yml +++ b/playbooks/groups/nagios-new.yml @@ -12,7 +12,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks }}/yumrepos.yml" + - include: "{{ tasks_path }}/yumrepos.yml" roles: - base @@ -32,11 +32,11 @@ host: "nagios{{env_suffix}}.fedoraproject.org" tasks: - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: deploy nagios service config hosts: nagios-new @@ -50,7 +50,7 @@ - "/srv/web/infra/ansible/vars/nagios.{{ inventory_hostname_short }}.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" roles: - nagios_server diff --git a/playbooks/groups/noc.yml b/playbooks/groups/noc.yml index 026396ba8..c5c153dc5 100644 --- a/playbooks/groups/noc.yml +++ b/playbooks/groups/noc.yml @@ -30,12 +30,12 @@ when: env == "production" tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: deploy service-specific config (just for production) hosts: nagios @@ -49,7 +49,7 @@ - "/srv/web/infra/ansible/vars/nagios.{{ inventory_hostname_short }}.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" roles: - { role: dhcp_server, when: datacenter == 'phx2' } diff --git a/playbooks/groups/notifs-backend.yml b/playbooks/groups/notifs-backend.yml index 75cb7d4a2..58de8307b 100644 --- a/playbooks/groups/notifs-backend.yml +++ b/playbooks/groups/notifs-backend.yml @@ -30,12 +30,12 @@ # when: env != "staging" } tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: dole out the service-specific config hosts: notifs-backend:notifs-backend-stg @@ -66,4 +66,4 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/notifs-web.yml b/playbooks/groups/notifs-web.yml index b89473711..cf5e49234 100644 --- a/playbooks/groups/notifs-web.yml +++ b/playbooks/groups/notifs-web.yml @@ -30,9 +30,9 @@ when: env != "staging" } tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/nuancier.yml b/playbooks/groups/nuancier.yml index d9524d0c1..d9a223469 100644 --- a/playbooks/groups/nuancier.yml +++ b/playbooks/groups/nuancier.yml @@ -28,12 +28,12 @@ - mod_wsgi tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: set up fedmsg hosts: nuancier:nuancier-stg @@ -49,7 +49,7 @@ - fedmsg/base handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: set up gluster on stg hosts: nuancier-stg @@ -125,4 +125,4 @@ - nuancier handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/openqa-workers.yml b/playbooks/groups/openqa-workers.yml index a41e7ae88..b58273550 100644 --- a/playbooks/groups/openqa-workers.yml +++ b/playbooks/groups/openqa-workers.yml @@ -20,9 +20,9 @@ - apache tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/openqa.yml b/playbooks/groups/openqa.yml index dd9b0e056..7bb4b75d6 100644 --- a/playbooks/groups/openqa.yml +++ b/playbooks/groups/openqa.yml @@ -23,12 +23,12 @@ - apache tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: configure openQA hosts: openqa:openqa-stg @@ -54,7 +54,7 @@ - { role: autocloudreporter, tags: ['autocloudreporter'] } handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: set up openQA server data NFS mounts (staging) hosts: openqa-stg @@ -77,7 +77,7 @@ tags: ['nfs_client'] handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: set up openQA server data NFS mounts (prod) hosts: openqa @@ -100,4 +100,4 @@ tags: ['nfs_client'] handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/openstack-compute-nodes.yml b/playbooks/groups/openstack-compute-nodes.yml index 70f8376da..234013744 100644 --- a/playbooks/groups/openstack-compute-nodes.yml +++ b/playbooks/groups/openstack-compute-nodes.yml @@ -21,9 +21,9 @@ - cloud_compute tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/osbs-cluster.yml b/playbooks/groups/osbs-cluster.yml index f286510a3..85dddc170 100644 --- a/playbooks/groups/osbs-cluster.yml +++ b/playbooks/groups/osbs-cluster.yml @@ -23,12 +23,12 @@ - sudo tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: OSBS control hosts pre-req setup hosts: osbs-control:osbs-control-stg diff --git a/playbooks/groups/packages.yml b/playbooks/groups/packages.yml index 86f5b00fe..ac256395e 100644 --- a/playbooks/groups/packages.yml +++ b/playbooks/groups/packages.yml @@ -29,12 +29,12 @@ - mod_wsgi tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: set up gluster server on prod hosts: packages @@ -56,7 +56,7 @@ datadir: /srv/glusterfs/packages handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: set up gluster client on prod hosts: packages @@ -82,7 +82,7 @@ mountdir: /var/cache/fedoracommunity handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: dole out the new service specific config hosts: packages:packages-stg @@ -101,4 +101,4 @@ process: fedmsg-hub handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/pagure.yml b/playbooks/groups/pagure.yml index a1a9a1b4e..099a795fe 100644 --- a/playbooks/groups/pagure.yml +++ b/playbooks/groups/pagure.yml @@ -22,12 +22,12 @@ - postgresql_server tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: deploy pagure itself hosts: pagure:pagure-stg @@ -56,4 +56,4 @@ - pagure/fedmsg handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/paste.yml b/playbooks/groups/paste.yml index b58b653e9..c26c34e10 100644 --- a/playbooks/groups/paste.yml +++ b/playbooks/groups/paste.yml @@ -25,9 +25,9 @@ when: env != "staging" } tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/pdc.yml b/playbooks/groups/pdc.yml index 676837399..88d329b16 100644 --- a/playbooks/groups/pdc.yml +++ b/playbooks/groups/pdc.yml @@ -11,7 +11,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" roles: - base @@ -23,9 +23,9 @@ - sudo tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" - name: stuff for the web nodes hosts: pdc-web:pdc-web-stg @@ -36,7 +36,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" roles: - role: openvpn/client @@ -54,7 +54,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" roles: - fedmsg/base diff --git a/playbooks/groups/people.yml b/playbooks/groups/people.yml index e583bd9c9..31f81e42f 100644 --- a/playbooks/groups/people.yml +++ b/playbooks/groups/people.yml @@ -81,9 +81,9 @@ - people tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/piwik.yml b/playbooks/groups/piwik.yml index 0bda61012..914e94cb8 100644 --- a/playbooks/groups/piwik.yml +++ b/playbooks/groups/piwik.yml @@ -25,9 +25,9 @@ - sudo tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/pkgdb.yml b/playbooks/groups/pkgdb.yml index b4c61af4f..87aaa743b 100644 --- a/playbooks/groups/pkgdb.yml +++ b/playbooks/groups/pkgdb.yml @@ -27,12 +27,12 @@ - mod_wsgi tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: set up fedmsg on pkgdb hosts: pkgdb-stg:pkgdb @@ -48,7 +48,7 @@ - fedmsg/base handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: deploy pkgdb itself hosts: pkgdb-stg:pkgdb @@ -64,4 +64,4 @@ - pkgdb2 handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/pkgs.yml b/playbooks/groups/pkgs.yml index a6171ba74..879b322da 100644 --- a/playbooks/groups/pkgs.yml +++ b/playbooks/groups/pkgs.yml @@ -44,12 +44,12 @@ - { role: distgit/pagure, when: env == "staging" and inventory_hostname.startswith('pkgs01') } tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/2fa_client.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/motd.yml" + - include: "{{ tasks_path }}/2fa_client.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: setup fedmsg on pkgs hosts: pkgs-stg:pkgs02.phx2.fedoraproject.org @@ -67,4 +67,4 @@ - fedmsg/hub handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/postgresql-server-bdr.yml b/playbooks/groups/postgresql-server-bdr.yml index 77f3c933d..e2a63cca1 100644 --- a/playbooks/groups/postgresql-server-bdr.yml +++ b/playbooks/groups/postgresql-server-bdr.yml @@ -29,11 +29,11 @@ - postgresql_server_bdr tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" # TODO: add iscsi task handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/postgresql-server.yml b/playbooks/groups/postgresql-server.yml index 029f4a1cb..fca39fbd9 100644 --- a/playbooks/groups/postgresql-server.yml +++ b/playbooks/groups/postgresql-server.yml @@ -29,11 +29,11 @@ - { role: openvpn/client, when: inventory_hostname == "db-fas01.phx2.fedoraproject.org" or inventory_hostname == "db01.phx2.fedoraproject.org" } tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" # TODO: add iscsi task handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/proxies.yml b/playbooks/groups/proxies.yml index d31645a46..b4e22dedc 100644 --- a/playbooks/groups/proxies.yml +++ b/playbooks/groups/proxies.yml @@ -46,18 +46,18 @@ state=link when: inventory_hostname == 'proxy01.phx2.fedoraproject.org' - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" - # You might think we would want these tasks on the proxy nodes, but they + # You might think we would want these tasks_path on the proxy nodes, but they # actually deliver a configuration that our proxy-specific roles below then go # and overwrite... so, let's just leave them out. - #- include: "{{ tasks }}/apache.yml" - #- include: "{{ tasks }}/mod_wsgi.yml" + #- include: "{{ tasks_path }}/apache.yml" + #- include: "{{ tasks_path }}/mod_wsgi.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" # TODO @@ -89,7 +89,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" pre_tasks: # @@ -179,7 +179,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" pre_tasks: # diff --git a/playbooks/groups/qa.yml b/playbooks/groups/qa.yml index 2702155c5..d5573d645 100644 --- a/playbooks/groups/qa.yml +++ b/playbooks/groups/qa.yml @@ -28,15 +28,15 @@ - apache pre_tasks: - - include: "{{ tasks }}/yumrepos.yml" + - include: "{{ tasks_path }}/yumrepos.yml" tasks: # this is how you include other task lists - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: configure phabricator hosts: qa-prod:qa-stg @@ -54,7 +54,7 @@ - { role: phabricator, tags: ['phabricator'] } handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: configure qa uildbot CI @@ -74,7 +74,7 @@ - { role: taskotron/buildslave-configure, tags: ['buildslaveconfig'] } handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: configure static sites for qa-stg hosts: qa-prod:qa-stg @@ -113,6 +113,6 @@ when: deployment_type != "qa-stg", tags: ['imagefactoryclient'] } handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/releng-compose.yml b/playbooks/groups/releng-compose.yml index 513d1f811..fdd7b38ba 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 }}/yumrepos.yml" + - include: "{{ tasks_path }}/yumrepos.yml" roles: - base @@ -67,8 +67,8 @@ tasks: # this is how you include other task lists - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/resultsdb-dev.yml b/playbooks/groups/resultsdb-dev.yml index 318146146..141230e0d 100644 --- a/playbooks/groups/resultsdb-dev.yml +++ b/playbooks/groups/resultsdb-dev.yml @@ -28,12 +28,12 @@ tasks: # this is how you include other task lists - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: configure resultsdb and execdb hosts: resultsdb-dev @@ -51,5 +51,5 @@ - { role: taskotron/execdb, tags: ['execdb'] } handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/resultsdb-prod.yml b/playbooks/groups/resultsdb-prod.yml index d2fe457f2..4e617f126 100644 --- a/playbooks/groups/resultsdb-prod.yml +++ b/playbooks/groups/resultsdb-prod.yml @@ -29,12 +29,12 @@ tasks: # this is how you include other task lists - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: configure resultsdb production hosts: resultsdb-prod @@ -53,5 +53,5 @@ - { role: taskotron/execdb, tags: ['execdb'] } handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/resultsdb-stg.yml b/playbooks/groups/resultsdb-stg.yml index 4f8d629d4..cda7459b5 100644 --- a/playbooks/groups/resultsdb-stg.yml +++ b/playbooks/groups/resultsdb-stg.yml @@ -28,12 +28,12 @@ tasks: # this is how you include other task lists - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: configure resultsdb hosts: resultsdb-stg @@ -52,5 +52,5 @@ - { role: taskotron/execdb, tags: ['execdb'] } handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/retrace.yml b/playbooks/groups/retrace.yml index 28b48dfa6..fb787b670 100644 --- a/playbooks/groups/retrace.yml +++ b/playbooks/groups/retrace.yml @@ -20,12 +20,12 @@ - fedmsg/base tasks: - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: setup FAF server hosts: retrace:faf-stg diff --git a/playbooks/groups/secondary.yml b/playbooks/groups/secondary.yml index 9b15f557b..b8207f623 100644 --- a/playbooks/groups/secondary.yml +++ b/playbooks/groups/secondary.yml @@ -47,9 +47,9 @@ - archive.fedoraproject.org - archives.fedoraproject.org tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" - name: Install some misc packages needed for various tasks yum: pkg={{ item }} state=present @@ -71,4 +71,4 @@ cron_file=update-fullfiletimelist handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/sign-bridge.yml b/playbooks/groups/sign-bridge.yml index 7eeebe09e..77f3b0059 100644 --- a/playbooks/groups/sign-bridge.yml +++ b/playbooks/groups/sign-bridge.yml @@ -31,9 +31,9 @@ owner_group: sigul tasks: - - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/smtp-mm.yml b/playbooks/groups/smtp-mm.yml index 6807a5c27..e0d806d4a 100644 --- a/playbooks/groups/smtp-mm.yml +++ b/playbooks/groups/smtp-mm.yml @@ -24,9 +24,9 @@ when: env != "staging" } tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/statscache.yml b/playbooks/groups/statscache.yml index ee7a8a9f6..65725401f 100644 --- a/playbooks/groups/statscache.yml +++ b/playbooks/groups/statscache.yml @@ -14,7 +14,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" roles: - base @@ -27,9 +27,9 @@ - sudo tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" - name: Stuff just for the web frontend hosts: statscache-web:statscache-web-stg @@ -40,7 +40,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" roles: - mod_wsgi @@ -57,7 +57,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" roles: - fedmsg/hub diff --git a/playbooks/groups/summershum.yml b/playbooks/groups/summershum.yml index 6c452cfc0..1706c6ad0 100644 --- a/playbooks/groups/summershum.yml +++ b/playbooks/groups/summershum.yml @@ -29,12 +29,12 @@ # when: env != "staging" } tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: set up fedmsg basics hosts: summershum:summershum-stg @@ -50,7 +50,7 @@ - fedmsg/base handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: dole out the service-specific config hosts: summershum:summershum-stg @@ -69,4 +69,4 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/sundries.yml b/playbooks/groups/sundries.yml index fe9c67e50..4a9e2324a 100644 --- a/playbooks/groups/sundries.yml +++ b/playbooks/groups/sundries.yml @@ -53,9 +53,9 @@ when: master_sundries_node tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/tagger.yml b/playbooks/groups/tagger.yml index 6171a793b..8bb044cf2 100644 --- a/playbooks/groups/tagger.yml +++ b/playbooks/groups/tagger.yml @@ -29,12 +29,12 @@ - mod_wsgi tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: dole out the service specific config hosts: tagger:tagger-stg @@ -50,7 +50,7 @@ - tagger handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" # This comes last because it relies on a group created by the tagger role. - name: setup fedmsg @@ -67,4 +67,4 @@ - fedmsg/base handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/taskotron-client-hosts.yml b/playbooks/groups/taskotron-client-hosts.yml index 35a1560b8..4996dbc2f 100644 --- a/playbooks/groups/taskotron-client-hosts.yml +++ b/playbooks/groups/taskotron-client-hosts.yml @@ -26,12 +26,12 @@ - { role: openvpn/client, when: datacenter != "phx2" } tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: configure taskotron imagefactory hosts: qa11.qa.fedoraproject.org:qa12.qa.fedoraproject.org @@ -47,7 +47,7 @@ - { role: taskotron/imagefactory, tags: ['taskotronimagefactory'] } handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: configure taskotron client host hosts: taskotron-dev-client-hosts:taskotron-stg-client-hosts:taskotron-prod-client-hosts @@ -66,6 +66,6 @@ - { role: taskotron/buildslave-configure, tags: ['buildslaveconfigure'] } handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/taskotron-dev.yml b/playbooks/groups/taskotron-dev.yml index b8b8ea009..093da6047 100644 --- a/playbooks/groups/taskotron-dev.yml +++ b/playbooks/groups/taskotron-dev.yml @@ -28,12 +28,12 @@ tasks: # this is how you include other task lists - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: configure taskotron master hosts: taskotron-dev @@ -56,4 +56,4 @@ - { role: taskotron/ssl-taskotron, tags: ['ssltaskotron'] } handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/taskotron-prod.yml b/playbooks/groups/taskotron-prod.yml index 633feaf92..184b11b00 100644 --- a/playbooks/groups/taskotron-prod.yml +++ b/playbooks/groups/taskotron-prod.yml @@ -29,12 +29,12 @@ tasks: # this is how you include other task lists - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: configure taskotron master hosts: taskotron-prod @@ -55,4 +55,4 @@ - { role: taskotron/taskotron-frontend, tags: ['frontend'] } handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/taskotron-stg.yml b/playbooks/groups/taskotron-stg.yml index 1c5ff498b..282094aa8 100644 --- a/playbooks/groups/taskotron-stg.yml +++ b/playbooks/groups/taskotron-stg.yml @@ -27,12 +27,12 @@ tasks: # this is how you include other task lists - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: configure taskotron master hosts: taskotron-stg @@ -53,4 +53,4 @@ - { role: taskotron/taskotron-frontend, tags: ['frontend'] } handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/taskotron.yml b/playbooks/groups/taskotron.yml index 6a241ff22..d6590747f 100644 --- a/playbooks/groups/taskotron.yml +++ b/playbooks/groups/taskotron.yml @@ -31,12 +31,12 @@ tasks: # this is how you include other task lists - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: configure taskotron master hosts: taskotron-dev:taskotron-stg:taskotron-prod @@ -60,7 +60,7 @@ - { role: taskotron/taskotron-master, tags: ['taskotronmaster'] } handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: configure standalone taskotron host hosts: taskotron-dev @@ -77,4 +77,4 @@ - { role: taskotron/ssl-taskotron, tags: ['ssltaskotron'] } handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/torrent.yml b/playbooks/groups/torrent.yml index 7ec5f6ae8..1d69ed68a 100644 --- a/playbooks/groups/torrent.yml +++ b/playbooks/groups/torrent.yml @@ -35,9 +35,9 @@ sslonly: true tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/twisted-buildbots.yml b/playbooks/groups/twisted-buildbots.yml index 3797497d6..6610920c8 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 }}/persistent_cloud.yml" + - include: "{{ 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 }}/cloud_setup_basic.yml" + - include: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" diff --git a/playbooks/groups/unbound.yml b/playbooks/groups/unbound.yml index 068c41604..76de92e13 100644 --- a/playbooks/groups/unbound.yml +++ b/playbooks/groups/unbound.yml @@ -23,9 +23,9 @@ when: env != "staging" } tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/value.yml b/playbooks/groups/value.yml index fd1e84feb..a0fbba22e 100644 --- a/playbooks/groups/value.yml +++ b/playbooks/groups/value.yml @@ -30,9 +30,9 @@ - mote tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/virthost.yml b/playbooks/groups/virthost.yml index 04149cac0..dc4cfdc8e 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 }}/yumrepos.yml" + - include: "{{ tasks_path }}/yumrepos.yml" roles: - base @@ -28,8 +28,8 @@ - virthost tasks: - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/wiki.yml b/playbooks/groups/wiki.yml index 487c78d62..1e5adae54 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 }}/yumrepos.yml" + - include: "{{ tasks_path }}/yumrepos.yml" roles: - base @@ -36,8 +36,8 @@ when: env != "staging" } tasks: - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/zanata2fedmsg.yml b/playbooks/groups/zanata2fedmsg.yml index 600374019..8365e93de 100644 --- a/playbooks/groups/zanata2fedmsg.yml +++ b/playbooks/groups/zanata2fedmsg.yml @@ -29,12 +29,12 @@ - mod_wsgi tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: deploy service-specific config hosts: zanata2fedmsg:zanata2fedmsg-stg @@ -47,7 +47,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" roles: - zanata2fedmsg diff --git a/playbooks/hosts/artboard.fedorainfracloud.org.yml b/playbooks/hosts/artboard.fedorainfracloud.org.yml index 76d0346ce..cff8327f7 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 }}/persistent_cloud.yml" + - include: "{{ tasks_path }}/persistent_cloud.yml" - name: setup all the things hosts: artboard.fedorainfracloud.org @@ -21,7 +21,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks }}/cloud_setup_basic.yml" + - include: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" @@ -30,7 +30,7 @@ - name: Install common scripts copy: src={{ item }} dest=/usr/local/bin/ owner=root group=root mode=0755 with_fileglob: - - "{{ roles }}/base/files/common-scripts/*" + - "{{ roles_path }}/base/files/common-scripts/*" tags: - config - base @@ -119,4 +119,4 @@ - artboard handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/hosts/blockerbugs-dev.cloud.fedoraproject.org.yml b/playbooks/hosts/blockerbugs-dev.cloud.fedoraproject.org.yml index 13716db38..434b8666d 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 }}/persistent_cloud.yml" - - include: "{{ tasks }}/growroot_cloud.yml" + - include: "{{ tasks_path }}/persistent_cloud.yml" + - include: "{{ tasks_path }}/growroot_cloud.yml" - name: provision instance hosts: blockerbugs-dev.cloud.fedoraproject.org @@ -25,9 +25,9 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - - include: "{{ tasks }}/cloud_setup_basic.yml" + - include: "{{ 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 handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/hosts/cloud-noc01.cloud.fedoraproject.org.yml b/playbooks/hosts/cloud-noc01.cloud.fedoraproject.org.yml index 004e6ecec..e678d4c97 100644 --- a/playbooks/hosts/cloud-noc01.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/cloud-noc01.cloud.fedoraproject.org.yml @@ -22,10 +22,10 @@ - tftp_server tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/hosts/commops.fedorainfracloud.org.yml b/playbooks/hosts/commops.fedorainfracloud.org.yml index 72d4f7b5a..0ae1a3983 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 }}/persistent_cloud.yml" + - include: "{{ tasks_path }}/persistent_cloud.yml" - name: setup all the things hosts: commops.fedorainfracloud.org @@ -21,6 +21,6 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks }}/cloud_setup_basic.yml" + - include: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" diff --git a/playbooks/hosts/communityblog.fedorainfracloud.org.yml b/playbooks/hosts/communityblog.fedorainfracloud.org.yml index a5b5d8e79..347863dfe 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 }}/persistent_cloud.yml" + - include: "{{ tasks_path }}/persistent_cloud.yml" - name: setup all the things hosts: communityblog.fedorainfracloud.org @@ -21,7 +21,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks }}/cloud_setup_basic.yml" + - include: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" diff --git a/playbooks/hosts/darkserver-dev.fedorainfracloud.org.yml b/playbooks/hosts/darkserver-dev.fedorainfracloud.org.yml index ce76d5daf..3e941700d 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 }}/persistent_cloud.yml" - - include: "{{ tasks }}/growroot_cloud_el7.yml" + - include: "{{ tasks_path }}/persistent_cloud.yml" + - include: "{{ tasks_path }}/growroot_cloud_el7.yml" - name: setup all the things hosts: darkserver-dev.fedorainfracloud.org @@ -22,6 +22,6 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks }}/cloud_setup_basic.yml" + - include: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" diff --git a/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml b/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml index 1a316b189..1342bb450 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 }}/yumrepos.yml" + - include: "{{ tasks_path }}/yumrepos.yml" roles: - base @@ -31,11 +31,11 @@ - web-data-analysis tasks: - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: dole out the service-specific config hosts: data-analysis01.phx2.fedoraproject.org @@ -46,7 +46,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" roles: - role: nfs/client diff --git a/playbooks/hosts/developer.fedorainfracloud.org.yml b/playbooks/hosts/developer.fedorainfracloud.org.yml index d8485c209..44b64cdfb 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 }}/persistent_cloud.yml" + - include: "{{ tasks_path }}/persistent_cloud.yml" - name: setup all the things hosts: developer.fedorainfracloud.org @@ -21,6 +21,6 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - - include: "{{ tasks }}/cloud_setup_basic.yml" + - include: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" diff --git a/playbooks/hosts/eclipse.fedorainfracloud.org.yml b/playbooks/hosts/eclipse.fedorainfracloud.org.yml index 6f4100774..514753654 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 }}/persistent_cloud.yml" + - include: "{{ tasks_path }}/persistent_cloud.yml" - name: setup all the things hosts: eclipse.fedorainfracloud.org @@ -21,9 +21,9 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks }}/yumrepos.yml" + - include: "{{ tasks_path }}/yumrepos.yml" tasks: - - include: "{{ tasks }}/cloud_setup_basic.yml" + - include: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" diff --git a/playbooks/hosts/faitout.fedorainfracloud.org.yml b/playbooks/hosts/faitout.fedorainfracloud.org.yml index 34188125a..1707c5a1a 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 }}/persistent_cloud.yml" + - include: "{{ tasks_path }}/persistent_cloud.yml" - name: setup all the things hosts: faitout.fedorainfracloud.org @@ -21,6 +21,6 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks }}/cloud_setup_basic.yml" + - include: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" diff --git a/playbooks/hosts/fas2-dev.fedorainfracloud.org.yml b/playbooks/hosts/fas2-dev.fedorainfracloud.org.yml index 804534fbd..b7bc4c1ba 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 }}/persistent_cloud.yml" + - include: "{{ tasks_path }}/persistent_cloud.yml" - name: setup all the things hosts: fas2-dev.fedorainfracloud.org @@ -21,6 +21,6 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks }}/cloud_setup_basic.yml" + - include: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" diff --git a/playbooks/hosts/fas3-dev.fedorainfracloud.org.yml b/playbooks/hosts/fas3-dev.fedorainfracloud.org.yml index 42d41f3db..bb637b3ec 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 }}/persistent_cloud.yml" + - include: "{{ tasks_path }}/persistent_cloud.yml" - name: setup all the things hosts: fas3-dev.fedorainfracloud.org @@ -21,6 +21,6 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks }}/cloud_setup_basic.yml" + - include: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" diff --git a/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml b/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml index 32624e673..e830789f4 100644 --- a/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml @@ -41,14 +41,14 @@ - sudo handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" tasks: - - include: "{{ tasks }}/cloud_setup_basic.yml" + - include: "{{ tasks_path }}/cloud_setup_basic.yml" vars: root_auth_users: msuchy - - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" + - include: "{{ tasks_path }}/2fa_client.yml" - name: set root passwd user: name=root password={{ cloud_rootpw }} state=present @@ -575,7 +575,7 @@ - restart cinder scheduler - restart cinder volume - # flush handlers here in case cinder changes and we need to restart it. + # flush handlers_path here in case cinder changes and we need to restart it. - meta: flush_handlers # create storage types diff --git a/playbooks/hosts/fedimg-dev.fedorainfracloud.org.yml b/playbooks/hosts/fedimg-dev.fedorainfracloud.org.yml index fa8cb2661..a6c6d8389 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 }}/persistent_cloud.yml" + - include: "{{ tasks_path }}/persistent_cloud.yml" - name: setup all the things hosts: fedimg-dev.fedorainfracloud.org @@ -21,13 +21,13 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" pre_tasks: - - include: "{{ tasks }}/cloud_setup_basic.yml" + - include: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" diff --git a/playbooks/hosts/fedora-bootstrap.fedorainfracloud.org.yml b/playbooks/hosts/fedora-bootstrap.fedorainfracloud.org.yml index 4f0776942..61ef4efc0 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 }}/persistent_cloud.yml" + - include: "{{ tasks_path }}/persistent_cloud.yml" - name: setup all the things hosts: fedora-bootstrap.fedorainfracloud.org @@ -21,7 +21,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks }}/cloud_setup_basic.yml" + - include: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" diff --git a/playbooks/hosts/fedora-hubs-dev.yml b/playbooks/hosts/fedora-hubs-dev.yml index af370439a..73c0839ec 100644 --- a/playbooks/hosts/fedora-hubs-dev.yml +++ b/playbooks/hosts/fedora-hubs-dev.yml @@ -9,7 +9,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - - include: "{{ tasks }}/yumrepos.yml" + - include: "{{ tasks_path }}/yumrepos.yml" - yum: name={{item}} state=present with_items: - git diff --git a/playbooks/hosts/glittergallery-dev.fedorainfracloud.org.yml b/playbooks/hosts/glittergallery-dev.fedorainfracloud.org.yml index 889019d26..e5ae32e40 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 }}/persistent_cloud.yml" + - include: "{{ tasks_path }}/persistent_cloud.yml" - name: setup all the things hosts: glittergallery-dev.fedorainfracloud.org @@ -21,6 +21,6 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks }}/cloud_setup_basic.yml" + - include: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" diff --git a/playbooks/hosts/grafana.cloud.fedoraproject.org.yml b/playbooks/hosts/grafana.cloud.fedoraproject.org.yml index a1fccf4dd..54bba0722 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 }}/persistent_cloud.yml" + - include: "{{ tasks_path }}/persistent_cloud.yml" - name: setup all the things hosts: grafana.cloud.fedoraproject.org @@ -30,14 +30,14 @@ - graphite/grafana tasks: - - include: "{{ tasks }}/yumrepos.yml" - #- include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + #- include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" pre_tasks: - - include: "{{ tasks }}/cloud_setup_basic.yml" + - include: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" diff --git a/playbooks/hosts/graphite.fedorainfracloud.org.yml b/playbooks/hosts/graphite.fedorainfracloud.org.yml index a80e64e65..bc176124c 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 }}/persistent_cloud.yml" + - include: "{{ tasks_path }}/persistent_cloud.yml" - name: setup all the things hosts: graphite.fedorainfracloud.org @@ -30,14 +30,14 @@ - graphite/fedmsg2statsd tasks: - - include: "{{ tasks }}/yumrepos.yml" - #- include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + #- include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" pre_tasks: - - include: "{{ tasks }}/cloud_setup_basic.yml" + - include: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" diff --git a/playbooks/hosts/iddev.fedorainfracloud.org.yml b/playbooks/hosts/iddev.fedorainfracloud.org.yml index d96cc71f3..42650d5f3 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 }}/persistent_cloud.yml" + - include: "{{ tasks_path }}/persistent_cloud.yml" - name: setup all the things hosts: iddev.fedorainfracloud.org @@ -27,12 +27,12 @@ - base pre_tasks: - - include: "{{ tasks }}/yumrepos.yml" + - include: "{{ tasks_path }}/yumrepos.yml" tasks: - - include: "{{ tasks }}/cloud_setup_basic.yml" + - include: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/hosts/insim.fedorainfracloud.org.yml b/playbooks/hosts/insim.fedorainfracloud.org.yml index 4eff5256b..b39cf5b02 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 }}/persistent_cloud.yml" + - include: "{{ tasks_path }}/persistent_cloud.yml" - name: setup all the things hosts: insim.fedorainfracloud.org @@ -22,7 +22,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks }}/cloud_setup_basic.yml" + - include: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" diff --git a/playbooks/hosts/java-deptools.fedorainfracloud.org b/playbooks/hosts/java-deptools.fedorainfracloud.org index b0254f6e9..4ed71d65e 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 }}/persistent_cloud.yml" + - include: "{{ tasks_path }}/persistent_cloud.yml" - name: setup all the things hosts: java-deptools.fedorainfracloud.org @@ -21,6 +21,6 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks }}/cloud_setup_basic.yml" + - include: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) shell: "hostname {{inventory_hostname}}" diff --git a/playbooks/hosts/kolinahr.fedorainfracloud.org.yml b/playbooks/hosts/kolinahr.fedorainfracloud.org.yml index 074764029..2dbfd161b 100644 --- a/playbooks/hosts/kolinahr.fedorainfracloud.org.yml +++ b/playbooks/hosts/kolinahr.fedorainfracloud.org.yml @@ -9,7 +9,7 @@ - /srv/private/ansible/files/openstack/passwords.yml tasks: - - include: "{{ tasks }}/persistent_cloud.yml" + - include: "{{ tasks_path }}/persistent_cloud.yml" - name: setup all the things hosts: kolinahr.fedorainfracloud.org @@ -21,6 +21,6 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks }}/cloud_setup_basic.yml" + - include: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" diff --git a/playbooks/hosts/lists-dev.fedorainfracloud.org.yml b/playbooks/hosts/lists-dev.fedorainfracloud.org.yml index 54ec99525..90ad90c8e 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 }}/persistent_cloud.yml" + - include: "{{ tasks_path }}/persistent_cloud.yml" - name: setup all the things hosts: lists-dev.fedorainfracloud.org @@ -22,10 +22,10 @@ vars: - tcp_ports: [22, 25, 80, 443] - udp_ports: [] - - postfix_maincf: "{{ roles }}/base/files/postfix/main.cf/main.cf.{{ inventory_hostname }}" + - postfix_maincf: "{{ roles_path }}/base/files/postfix/main.cf/main.cf.{{ inventory_hostname }}" pre_tasks: - - include: "{{ tasks }}/cloud_setup_basic.yml" + - include: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" @@ -36,9 +36,9 @@ - base tasks: - - include: "{{ tasks }}/postfix_basic.yml" - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/postfix_basic.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/motd.yml" # Basic Apache config - name: install mod_ssl @@ -82,7 +82,7 @@ owner=root group=root mode=0440 handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: restart postgresql service: name=postgresql state=restarted @@ -167,6 +167,6 @@ handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: reload aliases command: newaliases diff --git a/playbooks/hosts/magazine.fedorainfracloud.org.yml b/playbooks/hosts/magazine.fedorainfracloud.org.yml index 1a9aad9e6..cfc11fd5f 100644 --- a/playbooks/hosts/magazine.fedorainfracloud.org.yml +++ b/playbooks/hosts/magazine.fedorainfracloud.org.yml @@ -9,7 +9,7 @@ - /srv/private/ansible/files/openstack/passwords.yml tasks: - - include: "{{ tasks }}/persistent_cloud.yml" + - include: "{{ tasks_path }}/persistent_cloud.yml" - name: setup all the things hosts: magazine.fedorainfracloud.org @@ -21,7 +21,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks }}/cloud_setup_basic.yml" + - include: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" diff --git a/playbooks/hosts/modernpaste.fedorainfracloud.org.yml b/playbooks/hosts/modernpaste.fedorainfracloud.org.yml index 67150966e..253426a1c 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 }}/persistent_cloud.yml" + - include: "{{ tasks_path }}/persistent_cloud.yml" - name: setup all the things hosts: modernpaste.fedorainfracloud.org @@ -27,9 +27,9 @@ - base pre_tasks: - - include: "{{ tasks }}/yumrepos.yml" + - include: "{{ tasks_path }}/yumrepos.yml" tasks: - - include: "{{ tasks }}/cloud_setup_basic.yml" + - include: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" diff --git a/playbooks/hosts/modularity.fedorainfracloud.org.yml b/playbooks/hosts/modularity.fedorainfracloud.org.yml index e44ce70f8..fa50012c5 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 }}/persistent_cloud.yml" + - include: "{{ tasks_path }}/persistent_cloud.yml" - name: setup all the things hosts: regcfp.fedorainfracloud.org @@ -21,6 +21,6 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks }}/cloud_setup_basic.yml" + - include: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" diff --git a/playbooks/hosts/piwik.fedorainfracloud.org.yml b/playbooks/hosts/piwik.fedorainfracloud.org.yml index 8d7936a79..ab8d53852 100644 --- a/playbooks/hosts/piwik.fedorainfracloud.org.yml +++ b/playbooks/hosts/piwik.fedorainfracloud.org.yml @@ -9,7 +9,7 @@ - /srv/private/ansible/files/openstack/passwords.yml tasks: - - include: "{{ tasks }}/persistent_cloud.yml" + - include: "{{ tasks_path }}/persistent_cloud.yml" - name: setup all the things hosts: piwik.fedorainfracloud.org @@ -21,7 +21,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" roles: - sudo @@ -32,9 +32,9 @@ - nagios/client pre_tasks: - - include: "{{ tasks }}/yumrepos.yml" + - include: "{{ tasks_path }}/yumrepos.yml" tasks: - - include: "{{ tasks }}/cloud_setup_basic.yml" + - include: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" diff --git a/playbooks/hosts/regcfp.fedorainfracloud.org.yml b/playbooks/hosts/regcfp.fedorainfracloud.org.yml index 097cd6fc2..46d4b4843 100644 --- a/playbooks/hosts/regcfp.fedorainfracloud.org.yml +++ b/playbooks/hosts/regcfp.fedorainfracloud.org.yml @@ -9,7 +9,7 @@ - /srv/private/ansible/files/openstack/passwords.yml tasks: - - include: "{{ tasks }}/persistent_cloud.yml" + - include: "{{ tasks_path }}/persistent_cloud.yml" - name: setup all the things hosts: regcfp.fedorainfracloud.org @@ -21,7 +21,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks }}/cloud_setup_basic.yml" + - include: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" diff --git a/playbooks/hosts/respins.fedorainfracloud.org.yml b/playbooks/hosts/respins.fedorainfracloud.org.yml index 86e845222..28df9a969 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 }}/persistent_cloud.yml" + - include: "{{ tasks_path }}/persistent_cloud.yml" - name: setup all the things hosts: respins.fedorainfracloud.org @@ -21,6 +21,6 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks }}/cloud_setup_basic.yml" + - include: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" diff --git a/playbooks/hosts/shogun-ca.cloud.fedoraproject.org.yml b/playbooks/hosts/shogun-ca.cloud.fedoraproject.org.yml index bfb492e61..92114dd1e 100644 --- a/playbooks/hosts/shogun-ca.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/shogun-ca.cloud.fedoraproject.org.yml @@ -8,8 +8,8 @@ - "/srv/private/ansible/vars.yml" tasks: - - include: "{{ tasks }}/persistent_cloud.yml" - - include: "{{ tasks }}/growroot_cloud.yml" + - include: "{{ tasks_path }}/persistent_cloud.yml" + - include: "{{ tasks_path }}/growroot_cloud.yml" - name: provision instance hosts: 209.132.184.157 @@ -22,8 +22,8 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - - include: "{{ tasks }}/cloud_setup_basic.yml" - - include: "{{ tasks }}/postfix_basic.yml" + - include: "{{ tasks_path }}/cloud_setup_basic.yml" + - include: "{{ tasks_path }}/postfix_basic.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/hosts/shumgrepper-dev.fedorainfracloud.org.yml b/playbooks/hosts/shumgrepper-dev.fedorainfracloud.org.yml index 11ee78054..94986d7d4 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 }}/persistent_cloud.yml" + - include: "{{ tasks_path }}/persistent_cloud.yml" - name: setup all the things hosts: shumgrepper-dev.fedorainfracloud.org @@ -21,6 +21,6 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks }}/cloud_setup_basic.yml" + - include: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" diff --git a/playbooks/hosts/taiga.fedorainfracloud.org.yml b/playbooks/hosts/taiga.fedorainfracloud.org.yml index 670bcd8a2..639eea303 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 }}/persistent_cloud.yml" + - include: "{{ tasks_path }}/persistent_cloud.yml" - name: setup all the things hosts: taiga.fedorainfracloud.org @@ -20,7 +20,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks }}/cloud_setup_basic.yml" + - include: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" diff --git a/playbooks/hosts/taigastg.fedorainfracloud.org.yml b/playbooks/hosts/taigastg.fedorainfracloud.org.yml index e3dbeaf8a..49743fca7 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 }}/persistent_cloud.yml" + - include: "{{ tasks_path }}/persistent_cloud.yml" - name: setup all the things hosts: taigastg.fedorainfracloud.org @@ -21,7 +21,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks }}/cloud_setup_basic.yml" + - include: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" diff --git a/playbooks/hosts/testdays.fedorainfracloud.org.yml b/playbooks/hosts/testdays.fedorainfracloud.org.yml index 3cb4cd409..f8b6287c3 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 }}/persistent_cloud.yml" + - include: "{{ tasks_path }}/persistent_cloud.yml" - name: setup all the things hosts: testdays.fedorainfracloud.org @@ -22,7 +22,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: - - include: "{{ tasks }}/cloud_setup_basic.yml" + - include: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" @@ -56,5 +56,5 @@ - { role: testdays, tags: ['testdays'] } handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/include/proxies-certificates.yml b/playbooks/include/proxies-certificates.yml index 568559dd6..f52c3d12b 100644 --- a/playbooks/include/proxies-certificates.yml +++ b/playbooks/include/proxies-certificates.yml @@ -9,7 +9,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" roles: diff --git a/playbooks/include/proxies-fedora-web.yml b/playbooks/include/proxies-fedora-web.yml index 540ed1944..119a62de5 100644 --- a/playbooks/include/proxies-fedora-web.yml +++ b/playbooks/include/proxies-fedora-web.yml @@ -9,7 +9,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" roles: diff --git a/playbooks/include/proxies-fedorahosted.yml b/playbooks/include/proxies-fedorahosted.yml index cc1c9d123..8b11cfb73 100644 --- a/playbooks/include/proxies-fedorahosted.yml +++ b/playbooks/include/proxies-fedorahosted.yml @@ -9,7 +9,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" tasks: - name: install special fedorahosted-redirects.conf with fedorahosted redirects diff --git a/playbooks/include/proxies-haproxy.yml b/playbooks/include/proxies-haproxy.yml index 7e5ebd29b..bb1f85545 100644 --- a/playbooks/include/proxies-haproxy.yml +++ b/playbooks/include/proxies-haproxy.yml @@ -9,7 +9,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" roles: diff --git a/playbooks/include/proxies-miscellaneous.yml b/playbooks/include/proxies-miscellaneous.yml index e1ae56bbb..bbf6d5690 100644 --- a/playbooks/include/proxies-miscellaneous.yml +++ b/playbooks/include/proxies-miscellaneous.yml @@ -9,7 +9,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" tasks: # We retired this in favor of PDC diff --git a/playbooks/include/proxies-redirects.yml b/playbooks/include/proxies-redirects.yml index 3df8dd449..37dc108a5 100644 --- a/playbooks/include/proxies-redirects.yml +++ b/playbooks/include/proxies-redirects.yml @@ -9,7 +9,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" roles: diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml index d264b3637..1a103b9b2 100644 --- a/playbooks/include/proxies-reverseproxy.yml +++ b/playbooks/include/proxies-reverseproxy.yml @@ -9,7 +9,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" vars: - varnish_url: http://localhost:6081 diff --git a/playbooks/include/proxies-rewrites.yml b/playbooks/include/proxies-rewrites.yml index c72f73bb5..3cd51b661 100644 --- a/playbooks/include/proxies-rewrites.yml +++ b/playbooks/include/proxies-rewrites.yml @@ -9,7 +9,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" roles: diff --git a/playbooks/include/proxies-websites.yml b/playbooks/include/proxies-websites.yml index f3f34ef00..59c19d33a 100644 --- a/playbooks/include/proxies-websites.yml +++ b/playbooks/include/proxies-websites.yml @@ -9,7 +9,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" pre_tasks: diff --git a/playbooks/include/virt-create.yml b/playbooks/include/virt-create.yml index 061c3cdae..824bc555e 100644 --- a/playbooks/include/virt-create.yml +++ b/playbooks/include/virt-create.yml @@ -8,8 +8,8 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - - include: "{{ tasks }}/virt_instance_create.yml" + - include: "{{ tasks_path }}/virt_instance_create.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/manual/autosign.yml b/playbooks/manual/autosign.yml index ead1bf747..cb07eda7f 100644 --- a/playbooks/manual/autosign.yml +++ b/playbooks/manual/autosign.yml @@ -35,9 +35,9 @@ - robosignatory tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/manual/kernel-qa.yml b/playbooks/manual/kernel-qa.yml index de300d791..72c25a58a 100644 --- a/playbooks/manual/kernel-qa.yml +++ b/playbooks/manual/kernel-qa.yml @@ -21,9 +21,9 @@ - hosts tasks: - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/manual/push-badges.yml b/playbooks/manual/push-badges.yml index 0a9fd95ff..1536452b2 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: "{{ handlers }}/restart_services.yml" + - include: "{{ 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: "{{ handlers }}/restart_services.yml" + - include: "{{ 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: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/manual/qadevel.yml b/playbooks/manual/qadevel.yml index 9782e017a..b56902106 100644 --- a/playbooks/manual/qadevel.yml +++ b/playbooks/manual/qadevel.yml @@ -14,10 +14,10 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - - include: "{{ tasks }}/virt_instance_create.yml" + - include: "{{ tasks_path }}/virt_instance_create.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: make the box be real hosts: qadevel:qadevel-stg @@ -38,10 +38,10 @@ - sudo tasks: - - include: "{{ tasks }}/hosts.yml" - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/hosts.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/2fa_client.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/manual/rebuild/mote.yml b/playbooks/manual/rebuild/mote.yml index 91ad4bf9f..f58c0317f 100644 --- a/playbooks/manual/rebuild/mote.yml +++ b/playbooks/manual/rebuild/mote.yml @@ -6,7 +6,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" tasks: - file: dest=/var/cache/httpd/mote/cache.json state=absent diff --git a/playbooks/manual/releng-emergency-expire-old-repo.yml b/playbooks/manual/releng-emergency-expire-old-repo.yml index 2635b3c62..d465b061e 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: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/manual/restart_pkgdb.yml b/playbooks/manual/restart_pkgdb.yml index b4db24bbd..6f8b9a1a6 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: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" tasks: - name: Start apache diff --git a/playbooks/manual/sign-vault.yml b/playbooks/manual/sign-vault.yml index f6a026713..777e5012d 100644 --- a/playbooks/manual/sign-vault.yml +++ b/playbooks/manual/sign-vault.yml @@ -17,10 +17,10 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - - include: "{{ tasks }}/virt_instance_create.yml" + - include: "{{ tasks_path }}/virt_instance_create.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" - name: make sign vault server hosts: sign-vault @@ -39,8 +39,8 @@ - sigul/server tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/motd.yml" + - include: "{{ tasks_path }}/yumrepos.yml" + - include: "{{ tasks_path }}/motd.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/manual/staging-sync/bodhi.yml b/playbooks/manual/staging-sync/bodhi.yml index 00540a0c2..3caed52ac 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: "{{ handlers }}/restart_services.yml" + - include: "{{ 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 2af66ef3c..9b3a47bd6 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: "{{ handlers }}/restart_services.yml" + - include: "{{ 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: "{{ handlers }}/restart_services.yml" + - include: "{{ 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: "{{ handlers }}/restart_services.yml" + - include: "{{ 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: "{{ handlers }}/restart_services.yml" + - include: "{{ 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: "{{ handlers }}/restart_services.yml" + - include: "{{ 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: "{{ handlers }}/restart_services.yml" + - include: "{{ 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 494411269..d96d29f41 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: "{{ handlers }}/restart_services.yml" + - include: "{{ 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: "{{ handlers }}/restart_services.yml" + - include: "{{ 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: "{{ handlers }}/restart_services.yml" + - include: "{{ 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: "{{ handlers }}/restart_services.yml" + - include: "{{ 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: "{{ handlers }}/restart_services.yml" + - include: "{{ 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: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" tasks: # diff --git a/playbooks/manual/staging-sync/koji.yml b/playbooks/manual/staging-sync/koji.yml index c3b80a53c..4ee37add0 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: "{{ handlers }}/restart_services.yml" + - include: "{{ 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: "{{ handlers }}/restart_services.yml" + - include: "{{ 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: "{{ handlers }}/restart_services.yml" + - include: "{{ 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 3af10c4db..c58566436 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: "{{ handlers }}/restart_services.yml" + - include: "{{ 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: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" tasks: - shell: > @@ -67,7 +67,7 @@ - /srv/private/ansible/vars.yml - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" tasks: - service: name={{ item }} state=started diff --git a/playbooks/manual/staging-sync/mailman.yml b/playbooks/manual/staging-sync/mailman.yml index d762cc43d..f10ef04d0 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: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" tasks: - service: name=httpd state=stopped @@ -29,7 +29,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" tasks: #- template: src=templates/mailman-reset-staging.sql dest=/var/lib/pgsql/mailman-reset-staging.sql @@ -86,7 +86,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" 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 7096979ea..03ec7aa44 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: "{{ handlers }}/restart_services.yml" + - include: "{{ 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 02666c216..7428e71b2 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: "{{ handlers }}/restart_services.yml" + - include: "{{ 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 8b62d10e7..3b288b491 100644 --- a/playbooks/manual/update-firmware.yml +++ b/playbooks/manual/update-firmware.yml @@ -24,7 +24,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" vars: - updates: diff --git a/playbooks/manual/upgrade/anitya.yml b/playbooks/manual/upgrade/anitya.yml index dd9273e34..8d8971bb7 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: "{{ handlers }}/restart_services.yml" + - include: "{{ 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-testing {%endif%} @@ -26,7 +26,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" 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: "{{ handlers }}/restart_services.yml" + - include: "{{ 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 87b12cc60..a893a5f58 100644 --- a/playbooks/manual/upgrade/autocloud.yml +++ b/playbooks/manual/upgrade/autocloud.yml @@ -8,7 +8,7 @@ vars: testing: False handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" tasks: - name: clean all metadata @@ -31,7 +31,7 @@ vars: testing: False handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" tasks: - name: dnf update tunir packages from main repo @@ -51,7 +51,7 @@ vars: testing: False handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" tasks: - name: dnf update fedfind packages from main repo @@ -69,7 +69,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush w.r.t. the frontend @@ -91,7 +91,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush w.r.t. the backend @@ -134,7 +134,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" tasks: - service: name="httpd" state=started diff --git a/playbooks/manual/upgrade/badges.yml b/playbooks/manual/upgrade/badges.yml index 33c57656a..b09a1a0d6 100644 --- a/playbooks/manual/upgrade/badges.yml +++ b/playbooks/manual/upgrade/badges.yml @@ -8,7 +8,7 @@ vars: testing: False handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ 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: "{{ handlers }}/restart_services.yml" + - include: "{{ 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: "{{ handlers }}/restart_services.yml" + - include: "{{ 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: "{{ handlers }}/restart_services.yml" + - include: "{{ 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: "{{ handlers }}/restart_services.yml" + - include: "{{ 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 c156f6f79..d0ffb1525 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: "{{ handlers }}/restart_services.yml" + - include: "{{ 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: "{{ handlers }}/restart_services.yml" + - include: "{{ 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: "{{ handlers }}/restart_services.yml" + - include: "{{ 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: "{{ handlers }}/restart_services.yml" + - include: "{{ 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 6d2e058ed..a17b3ae18 100644 --- a/playbooks/manual/upgrade/bugyou.yml +++ b/playbooks/manual/upgrade/bugyou.yml @@ -8,7 +8,7 @@ vars: testing: False handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ 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: "{{ handlers }}/restart_services.yml" + - include: "{{ 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 80d8ccace..4cda0555f 100644 --- a/playbooks/manual/upgrade/bugzilla2fedmsg.yml +++ b/playbooks/manual/upgrade/bugzilla2fedmsg.yml @@ -8,7 +8,7 @@ vars: testing: False handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ 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: "{{ handlers }}/restart_services.yml" + - include: "{{ 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 46fe2eea0..c65f4b569 100644 --- a/playbooks/manual/upgrade/datagrepper.yml +++ b/playbooks/manual/upgrade/datagrepper.yml @@ -8,7 +8,7 @@ vars: testing: False handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ 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: "{{ handlers }}/restart_services.yml" + - include: "{{ 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 543ed1a4f..773cdfe0c 100644 --- a/playbooks/manual/upgrade/datanommer.yml +++ b/playbooks/manual/upgrade/datanommer.yml @@ -16,7 +16,7 @@ vars: testing: False handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ 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: "{{ handlers }}/restart_services.yml" + - include: "{{ 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: "{{ handlers }}/restart_services.yml" + - include: "{{ 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: "{{ handlers }}/restart_services.yml" + - include: "{{ 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: "{{ handlers }}/restart_services.yml" + - include: "{{ 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 96ad4b06c..7a118edbf 100644 --- a/playbooks/manual/upgrade/fedimg.yml +++ b/playbooks/manual/upgrade/fedimg.yml @@ -8,7 +8,7 @@ vars: testing: False handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ 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: "{{ handlers }}/restart_services.yml" + - include: "{{ 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 2ced492f6..c1d818e67 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: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" tasks: - name: clean all metadata {%if testing%}(with infrastructure-testing on){%endif%} @@ -60,7 +60,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" tasks: - service: name="httpd" state=restarted diff --git a/playbooks/manual/upgrade/fmn.yml b/playbooks/manual/upgrade/fmn.yml index 3f65b5294..483eb7ae1 100644 --- a/playbooks/manual/upgrade/fmn.yml +++ b/playbooks/manual/upgrade/fmn.yml @@ -8,7 +8,7 @@ vars: testing: False handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" tasks: - name: clean all metadata {%if testing%}(with infrastructure-testing on){%endif%} @@ -33,7 +33,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush w.r.t. the frontend @@ -55,7 +55,7 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" 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: "{{ handlers }}/restart_services.yml" + - include: "{{ 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 cfdbf5753..0de2a03ef 100644 --- a/playbooks/manual/upgrade/hotness.yml +++ b/playbooks/manual/upgrade/hotness.yml @@ -8,7 +8,7 @@ vars: testing: False handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ 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: "{{ handlers }}/restart_services.yml" + - include: "{{ 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 99e054b6e..14851cf43 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: "{{ handlers }}/restart_services.yml" + - include: "{{ 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: "{{ handlers }}/restart_services.yml" + - include: "{{ 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: "{{ handlers }}/restart_services.yml" + - include: "{{ 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: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" roles: - koschei/backend diff --git a/playbooks/manual/upgrade/mbs.yml b/playbooks/manual/upgrade/mbs.yml index 2aeb017b1..f9b9d7a0b 100644 --- a/playbooks/manual/upgrade/mbs.yml +++ b/playbooks/manual/upgrade/mbs.yml @@ -8,7 +8,7 @@ vars: testing: False handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ 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: "{{ handlers }}/restart_services.yml" + - include: "{{ 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: "{{ handlers }}/restart_services.yml" + - include: "{{ 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: "{{ handlers }}/restart_services.yml" + - include: "{{ 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: "{{ handlers }}/restart_services.yml" + - include: "{{ 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 7ff598074..91ead01c5 100644 --- a/playbooks/manual/upgrade/mote.yml +++ b/playbooks/manual/upgrade/mote.yml @@ -8,7 +8,7 @@ vars: testing: False handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ 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: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" pre_tasks: - name: tell nagios to shush diff --git a/playbooks/manual/upgrade/packages.yml b/playbooks/manual/upgrade/packages.yml index e8fea5ed9..a7cc6e255 100644 --- a/playbooks/manual/upgrade/packages.yml +++ b/playbooks/manual/upgrade/packages.yml @@ -8,7 +8,7 @@ vars: testing: False handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ 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: "{{ handlers }}/restart_services.yml" + - include: "{{ 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 a97c3ad98..349aed29e 100644 --- a/playbooks/manual/upgrade/pagure.yml +++ b/playbooks/manual/upgrade/pagure.yml @@ -12,7 +12,7 @@ vars: testing: False handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ 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 4f9c51d25..9503531c3 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: "{{ handlers }}/restart_services.yml" + - include: "{{ 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: "{{ handlers }}/restart_services.yml" + - include: "{{ 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: "{{ handlers }}/restart_services.yml" + - include: "{{ 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 91d8af8dd..eabb2df6e 100644 --- a/playbooks/manual/upgrade/statscache.yml +++ b/playbooks/manual/upgrade/statscache.yml @@ -8,7 +8,7 @@ vars: testing: False handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ 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: "{{ handlers }}/restart_services.yml" + - include: "{{ 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: "{{ handlers }}/restart_services.yml" + - include: "{{ 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: "{{ handlers }}/restart_services.yml" + - include: "{{ 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 353b573ce..652e46187 100644 --- a/playbooks/manual/upgrade/tagger.yml +++ b/playbooks/manual/upgrade/tagger.yml @@ -8,7 +8,7 @@ vars: testing: False handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ 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: "{{ handlers }}/restart_services.yml" + - include: "{{ 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 6c28bf57f..848cd6c81 100644 --- a/playbooks/restart_unbound.yml +++ b/playbooks/restart_unbound.yml @@ -13,4 +13,4 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - - include: "{{ tasks }}/restart_unbound.yml" + - include: "{{ tasks_path }}/restart_unbound.yml" diff --git a/playbooks/transient_cloud_instance.yml b/playbooks/transient_cloud_instance.yml index 61b1ae8e4..dd567ef8e 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 }}/transient_cloud.yml" + - include: "{{ 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 }}/cloud_setup_basic.yml" + - include: "{{ tasks_path }}/cloud_setup_basic.yml" handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/update_ticketkey.yml b/playbooks/update_ticketkey.yml index b7dd5c6f3..f1ddbd2cf 100644 --- a/playbooks/update_ticketkey.yml +++ b/playbooks/update_ticketkey.yml @@ -8,7 +8,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" tasks: - name: create new production ticket key @@ -27,7 +27,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: - - include: "{{ handlers }}/restart_services.yml" + - include: "{{ handlers_path }}/restart_services.yml" tasks: diff --git a/playbooks/vhost_reboot.yml b/playbooks/vhost_reboot.yml index 40ec644d4..ad80aaf7a 100644 --- a/playbooks/vhost_reboot.yml +++ b/playbooks/vhost_reboot.yml @@ -116,7 +116,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - - include: "{{ tasks }}/restart_unbound.yml" + - include: "{{ tasks_path }}/restart_unbound.yml" # - name: get info on guests (postreboot) # virt: command=info diff --git a/roles/copr/base/handlers/main.yml b/roles/copr/base/handlers/main.yml index 3ec4030b9..af3d17a9d 100644 --- a/roles/copr/base/handlers/main.yml +++ b/roles/copr/base/handlers/main.yml @@ -1,5 +1,5 @@ --- -- include: "{{ handlers }}/restart_services.yml" +- include: "{{ handlers_path }}/restart_services.yml" - name: restart postgresql service: name=postgresql state=restarted diff --git a/roles/copr/base/tasks/main.yml b/roles/copr/base/tasks/main.yml index 354b58a20..e5c26862b 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 }}/cloud_setup_basic.yml" +# - include: "{{ tasks_path }}/cloud_setup_basic.yml" # already included into the `base` role -#- include: "{{ tasks }}/postfix_basic.yml" +#- include: "{{ tasks_path }}/postfix_basic.yml" # To late to do it here ( #- name: setup correct hostname for copr machine diff --git a/roles/copr/frontend/handlers/main.yml b/roles/copr/frontend/handlers/main.yml index 577eb088e..d9cfff4d2 100644 --- a/roles/copr/frontend/handlers/main.yml +++ b/roles/copr/frontend/handlers/main.yml @@ -1 +1 @@ -- include: "{{ handlers }}/restart_services.yml" +- include: "{{ handlers_path }}/restart_services.yml" diff --git a/roles/copr/mbs/handlers/main.yml b/roles/copr/mbs/handlers/main.yml index e8c3b4b57..c60aec5ae 100644 --- a/roles/copr/mbs/handlers/main.yml +++ b/roles/copr/mbs/handlers/main.yml @@ -1,4 +1,4 @@ -- include: "{{ handlers }}/restart_services.yml" +- include: "{{ handlers_path }}/restart_services.yml" - name: daemon reload command: systemctl daemon-reload diff --git a/roles/fas_server/tasks/main.yml b/roles/fas_server/tasks/main.yml index 01a975bf5..57cc09623 100644 --- a/roles/fas_server/tasks/main.yml +++ b/roles/fas_server/tasks/main.yml @@ -375,7 +375,7 @@ - fas - name: HOTFIX fas2.py in python-bugzilla to add a bugzilla override for ticket 4827 - copy: src={{ roles }}/pkgdb2/files/fas2.py + copy: src={{ roles_path }}/pkgdb2/files/fas2.py dest=/usr/lib/python2.6/site-packages/fedora/client/fas2.py mode=644 owner=root group=root when: master_fas_node == True @@ -385,7 +385,7 @@ - hotfixfas - name: HOTFIX make sure only fas01 cleans up sessions - copy: src={{ roles }}/fas_server/files/controllers.py + copy: src={{ roles_path }}/fas_server/files/controllers.py dest=/usr/lib/python2.6/site-packages/fas/controllers.py mode=644 owner=root group=root tags: diff --git a/roles/mirrormanager/backend/tasks/main.yml b/roles/mirrormanager/backend/tasks/main.yml index bc8a60d17..2fba73bd6 100644 --- a/roles/mirrormanager/backend/tasks/main.yml +++ b/roles/mirrormanager/backend/tasks/main.yml @@ -23,9 +23,9 @@ template: src={{ item.file }} dest={{ item.dest }} owner=mirrormanager group=mirrormanager mode=0600 with_items: - - { file: "{{ roles }}/mirrormanager/frontend2/templates/mirrormanager2.cfg", + - { file: "{{ roles_path }}/mirrormanager/frontend2/templates/mirrormanager2.cfg", dest: /etc/mirrormanager/mirrormanager2.cfg } - - { file: "{{ roles }}/mirrormanager/frontend2/templates/alembic.ini", + - { file: "{{ roles_path }}/mirrormanager/frontend2/templates/alembic.ini", dest: /etc/mirrormanager/alembic.ini } tags: - config diff --git a/roles/mirrormanager/crawler/tasks/main.yml b/roles/mirrormanager/crawler/tasks/main.yml index cde637925..11d456aca 100644 --- a/roles/mirrormanager/crawler/tasks/main.yml +++ b/roles/mirrormanager/crawler/tasks/main.yml @@ -19,9 +19,9 @@ template: src={{ item.file }} dest={{ item.dest }} owner=mirrormanager group=mirrormanager mode=0600 with_items: - - { file: "{{ roles }}/mirrormanager/frontend2/templates/mirrormanager2.cfg", + - { file: "{{ roles_path }}/mirrormanager/frontend2/templates/mirrormanager2.cfg", dest: /etc/mirrormanager/mirrormanager2.cfg } - - { file: "{{ roles }}/mirrormanager/frontend2/templates/alembic.ini", + - { file: "{{ roles_path }}/mirrormanager/frontend2/templates/alembic.ini", dest: /etc/mirrormanager/alembic.ini } tags: - config diff --git a/roles/mirrormanager/frontend2/tasks/main.yml b/roles/mirrormanager/frontend2/tasks/main.yml index f7292a25c..377bdee98 100644 --- a/roles/mirrormanager/frontend2/tasks/main.yml +++ b/roles/mirrormanager/frontend2/tasks/main.yml @@ -112,7 +112,7 @@ - name: add authorized_keys for mirrormanager authorized_key: key="{{ item }}" user=mirrormanager state=present with_file: - - "{{ roles }}/mirrormanager/mirrorlist2/files/mm-authorized_key" + - "{{ roles_path }}/mirrormanager/mirrorlist2/files/mm-authorized_key" tags: - mm2_frontend @@ -123,7 +123,7 @@ - config - name: install interactive map file - copy: src={{ roles }}/membership-map/build/files/www/{{ item }} + copy: src={{ roles_path }}/membership-map/build/files/www/{{ item }} dest=/var/www/mirrormanager-statistics/map/{{ item }} owner=mirrormanager group=mirrormanager mode=0444 with_items: diff --git a/tasks/postfix_basic.yml b/tasks/postfix_basic.yml index 01ff1460b..5a9db7eb5 100644 --- a/tasks/postfix_basic.yml +++ b/tasks/postfix_basic.yml @@ -8,11 +8,11 @@ copy: src={{ item }} dest=/etc/postfix/main.cf with_first_found: - "{{ postfix_maincf }}" - - "{{ roles }}/base/files/postfix/main.cf/main.cf.{{ ansible_fqdn }}" - - "{{ roles }}/base/files/postfix/main.cf/main.cf.{{ inventory_hostname }}" - - "{{ roles }}/base/files/postfix/main.cf/main.cf.{{ host_group }}" - - "{{ roles }}/base/files/postfix/main.cf/main.cf.{{ postfix_group }}" - - "{{ roles }}/base/files/postfix/main.cf/main.cf" + - "{{ roles_path }}/base/files/postfix/main.cf/main.cf.{{ ansible_fqdn }}" + - "{{ roles_path }}/base/files/postfix/main.cf/main.cf.{{ inventory_hostname }}" + - "{{ roles_path }}/base/files/postfix/main.cf/main.cf.{{ host_group }}" + - "{{ roles_path }}/base/files/postfix/main.cf/main.cf.{{ postfix_group }}" + - "{{ roles_path }}/base/files/postfix/main.cf/main.cf" notify: - restart postfix tags: diff --git a/vars/global.yml b/vars/global.yml index 355e9b74d..44a461c7b 100644 --- a/vars/global.yml +++ b/vars/global.yml @@ -3,9 +3,9 @@ basedir: /srv/web/infra/ansible private: /srv/private/ansible bigfiles: /srv/web/infra/bigfiles files: /srv/web/infra/ansible/files -roles: /srv/web/infra/ansible/roles -handlers: /srv/web/infra/ansible/handlers -tasks: /srv/web/infra/ansible/tasks +roles_path: /srv/web/infra/ansible/roles +handlers_path: /srv/web/infra/ansible/handlers +tasks_path: /srv/web/infra/ansible/tasks vars_path: "/srv/web/infra/ansible/vars" dist_tag: unknown auth_keys_from_fas: '/srv/web/infra/ansible/scripts/auth-keys-from-fas' @@ -57,6 +57,3 @@ global_pkgs_inst: ['bind-utils', 'mailx', 'nc', 'openssh-clients', 'tmpwatch', 'traceroute', 'vim-enhanced', 'xz', 'zsh', 'libselinux-python', 'ntpdate', 'bash-completion', 'telnet', 'htop', 'rsyslog' ] - -# become: False by default so ansible doesn't try and check for it and hang -become: False |