Now that we have roles_path, drop the long path on all the roles.

This commit is contained in:
Kevin Fenzi 2014-01-23 17:12:40 +00:00
parent 406474a374
commit 206ed3f776
32 changed files with 159 additions and 159 deletions

View file

@ -12,10 +12,10 @@
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
roles: roles:
- /srv/web/infra/ansible/roles/base - base
- /srv/web/infra/ansible/roles/rkhunter - rkhunter
- /srv/web/infra/ansible/roles/denyhosts - denyhosts
- /srv/web/infra/ansible/roles/fas_client - fas_client
tasks: tasks:
# this is how you include other task lists # this is how you include other task lists

View file

@ -12,10 +12,10 @@
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
roles: roles:
- /srv/web/infra/ansible/roles/base - base
- /srv/web/infra/ansible/roles/rkhunter - rkhunter
- /srv/web/infra/ansible/roles/denyhosts - denyhosts
- /srv/web/infra/ansible/roles/fas_client - fas_client
tasks: tasks:
# this is how you include other task lists # this is how you include other task lists

View file

@ -12,11 +12,11 @@
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
roles: roles:
- /srv/web/infra/ansible/roles/base - base
- /srv/web/infra/ansible/roles/fas_client - fas_client
- /srv/web/infra/ansible/roles/rkhunter - rkhunter
- /srv/web/infra/ansible/roles/denyhosts - denyhosts
- /srv/web/infra/ansible/roles/nagios_client - nagios_client
tasks: tasks:
# this is how you include other task lists # this is how you include other task lists

View file

@ -28,13 +28,13 @@
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
roles: roles:
- /srv/web/infra/ansible/roles/base - base
- /srv/web/infra/ansible/roles/rkhunter - rkhunter
- /srv/web/infra/ansible/roles/denyhosts - denyhosts
- /srv/web/infra/ansible/roles/nagios_client - nagios_client
- /srv/web/infra/ansible/roles/fas_client - fas_client
- /srv/web/infra/ansible/roles/fedmsg_base - fedmsg_base
- /srv/web/infra/ansible/roles/ask - ask
tasks: tasks:
- include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/hosts.yml"

View file

@ -15,11 +15,11 @@
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
roles: roles:
- /srv/web/infra/ansible/roles/base - base
- /srv/web/infra/ansible/roles/rkhunter - rkhunter
- /srv/web/infra/ansible/roles/denyhosts - denyhosts
- /srv/web/infra/ansible/roles/nagios_client - nagios_client
- /srv/web/infra/ansible/roles/fas_client - fas_client
tasks: tasks:
- include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/hosts.yml"

View file

@ -32,12 +32,12 @@
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
roles: roles:
- /srv/web/infra/ansible/roles/base - base
- /srv/web/infra/ansible/roles/rkhunter - rkhunter
- /srv/web/infra/ansible/roles/denyhosts - denyhosts
- /srv/web/infra/ansible/roles/nagios_client - nagios_client
- /srv/web/infra/ansible/roles/fas_client - fas_client
- /srv/web/infra/ansible/roles/fedmsg_base - fedmsg_base
tasks: tasks:
- include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/hosts.yml"
@ -58,8 +58,8 @@
accelerate: True accelerate: True
roles: roles:
- /srv/web/infra/ansible/roles/fedmsg-hub - fedmsg-hub
- /srv/web/infra/ansible/roles/badges-backend - badges-backend
vars_files: vars_files:
- /srv/web/infra/ansible/vars/global.yml - /srv/web/infra/ansible/vars/global.yml

View file

@ -32,13 +32,13 @@
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
roles: roles:
- /srv/web/infra/ansible/roles/base - base
- /srv/web/infra/ansible/roles/rkhunter - rkhunter
- /srv/web/infra/ansible/roles/denyhosts - denyhosts
- /srv/web/infra/ansible/roles/nagios_client - nagios_client
- /srv/web/infra/ansible/roles/fas_client - fas_client
- /srv/web/infra/ansible/roles/badges-frontend - badges-frontend
- /srv/web/infra/ansible/roles/fedmsg_base - fedmsg_base
tasks: tasks:
- include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/hosts.yml"

View file

@ -29,11 +29,11 @@
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
roles: roles:
- /srv/web/infra/ansible/roles/base - base
- /srv/web/infra/ansible/roles/rkhunter - rkhunter
- /srv/web/infra/ansible/roles/denyhosts - denyhosts
- /srv/web/infra/ansible/roles/nagios_client - nagios_client
- /srv/web/infra/ansible/roles/fas_client - fas_client
tasks: tasks:
# this is how you include other task lists # this is how you include other task lists

View file

@ -13,7 +13,7 @@
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
roles: roles:
- /srv/web/infra/ansible/roles/base - base
tasks: tasks:
- include: "{{ tasks }}/koji/base_builder.yml" - include: "{{ tasks }}/koji/base_builder.yml"

View file

@ -14,7 +14,7 @@
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
roles: roles:
- /srv/web/infra/ansible/roles/base - base
tasks: tasks:
- include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/yumrepos.yml"
@ -39,7 +39,7 @@
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
roles: roles:
- /srv/web/infra/ansible/roles/base - base
tasks: tasks:
- include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/hosts.yml"

View file

@ -32,7 +32,7 @@
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
roles: roles:
- /srv/web/infra/ansible/roles/base - base
tasks: tasks:
- include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/hosts.yml"

View file

@ -25,12 +25,12 @@
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
roles: roles:
- /srv/web/infra/ansible/roles/base - base
- /srv/web/infra/ansible/roles/rkhunter - rkhunter
- /srv/web/infra/ansible/roles/denyhosts - denyhosts
- /srv/web/infra/ansible/roles/nagios_client - nagios_client
- /srv/web/infra/ansible/roles/fas_client - fas_client
- /srv/web/infra/ansible/roles/yum-cron - yum-cron
tasks: tasks:
# this is how you include other task lists # this is how you include other task lists

View file

@ -27,11 +27,11 @@
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
roles: roles:
- /srv/web/infra/ansible/roles/base - base
- /srv/web/infra/ansible/roles/rkhunter - rkhunter
- /srv/web/infra/ansible/roles/denyhosts - denyhosts
- /srv/web/infra/ansible/roles/nagios_client - nagios_client
- /srv/web/infra/ansible/roles/fas_client - fas_client
tasks: tasks:
- include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/hosts.yml"

View file

@ -32,11 +32,11 @@
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
roles: roles:
- /srv/web/infra/ansible/roles/base - base
- /srv/web/infra/ansible/roles/rkhunter - rkhunter
- /srv/web/infra/ansible/roles/denyhosts - denyhosts
- /srv/web/infra/ansible/roles/nagios_client - nagios_client
- /srv/web/infra/ansible/roles/fas_client - fas_client
tasks: tasks:
- include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/hosts.yml"
@ -64,7 +64,7 @@
- "{{ vars_path }}/{{ ansible_distribution }}.yml" - "{{ vars_path }}/{{ ansible_distribution }}.yml"
roles: roles:
- /srv/web/infra/ansible/roles/fedmsg_base - fedmsg_base
handlers: handlers:
- include: "{{ handlers }}/restart_services.yml" - include: "{{ handlers }}/restart_services.yml"
@ -81,7 +81,7 @@
- "{{ vars_path }}/{{ ansible_distribution }}.yml" - "{{ vars_path }}/{{ ansible_distribution }}.yml"
roles: roles:
- /srv/web/infra/ansible/roles/fedocal - fedocal
handlers: handlers:
- include: "{{ handlers }}/restart_services.yml" - include: "{{ handlers }}/restart_services.yml"

View file

@ -32,12 +32,12 @@
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
roles: roles:
- /srv/web/infra/ansible/roles/base - base
- /srv/web/infra/ansible/roles/rkhunter - rkhunter
- /srv/web/infra/ansible/roles/denyhosts - denyhosts
- /srv/web/infra/ansible/roles/nagios_client - nagios_client
- /srv/web/infra/ansible/roles/fas_client - fas_client
- /srv/web/infra/ansible/roles/fedmsg_base - fedmsg_base
tasks: tasks:
- include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/hosts.yml"
@ -62,7 +62,7 @@
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
roles: roles:
- /srv/web/infra/ansible/roles/gallery - gallery
handlers: handlers:
- include: "{{ handlers }}/restart_services.yml" - include: "{{ handlers }}/restart_services.yml"

View file

@ -28,7 +28,7 @@
- resolvconf: resolv.conf/jenkins-cloud - resolvconf: resolv.conf/jenkins-cloud
roles: roles:
- /srv/web/infra/ansible/roles/base - base
tasks: tasks:
- include: "{{ tasks }}/cloud_setup_basic.yml" - include: "{{ tasks }}/cloud_setup_basic.yml"

View file

@ -32,12 +32,12 @@
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
roles: roles:
- /srv/web/infra/ansible/roles/base - base
- /srv/web/infra/ansible/roles/rkhunter - rkhunter
- /srv/web/infra/ansible/roles/denyhosts - denyhosts
- /srv/web/infra/ansible/roles/nagios_client - nagios_client
- /srv/web/infra/ansible/roles/fas_client - fas_client
- /srv/web/infra/ansible/roles/fedmsg_base - fedmsg_base
tasks: tasks:
- include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/hosts.yml"

View file

@ -31,12 +31,12 @@
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
roles: roles:
- /srv/web/infra/ansible/roles/base - base
- /srv/web/infra/ansible/roles/rkhunter - rkhunter
- /srv/web/infra/ansible/roles/denyhosts - denyhosts
- /srv/web/infra/ansible/roles/nagios_client - nagios_client
- /srv/web/infra/ansible/roles/fas_client - fas_client
- /srv/web/infra/ansible/roles/koji_hub - koji_hub
tasks: tasks:
- include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/hosts.yml"

View file

@ -25,12 +25,12 @@
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
roles: roles:
- /srv/web/infra/ansible/roles/base - base
- /srv/web/infra/ansible/roles/rkhunter - rkhunter
- /srv/web/infra/ansible/roles/denyhosts - denyhosts
- /srv/web/infra/ansible/roles/nagios_client - nagios_client
- /srv/web/infra/ansible/roles/fas_client - fas_client
- /srv/web/infra/ansible/roles/ansible-server - ansible-server
tasks: tasks:
- include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/hosts.yml"

View file

@ -32,12 +32,12 @@
- "/srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml" - "/srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml"
roles: roles:
- /srv/web/infra/ansible/roles/base - base
- /srv/web/infra/ansible/roles/rkhunter - rkhunter
- /srv/web/infra/ansible/roles/denyhosts - denyhosts
- /srv/web/infra/ansible/roles/nagios_client - nagios_client
- /srv/web/infra/ansible/roles/fas_client - fas_client
- /srv/web/infra/ansible/roles/yum-cron - yum-cron
tasks: tasks:
# this is how you include other task lists # this is how you include other task lists
@ -97,8 +97,8 @@
- "/srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml" - "/srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml"
roles: roles:
- /srv/web/infra/ansible/roles/fedmsg_base - fedmsg_base
- role: /srv/web/infra/ansible/roles/mailman - role: mailman
mailman_dbserver: db02.stg.phx2.fedoraproject.org mailman_dbserver: db02.stg.phx2.fedoraproject.org
mailman_postfix_mydestination: "lists.fedoraproject.org, lists.stg.fedoraproject.org" mailman_postfix_mydestination: "lists.fedoraproject.org, lists.stg.fedoraproject.org"
mailman_mm_db_pass: "{{ mailman_mm_db_pass }}" mailman_mm_db_pass: "{{ mailman_mm_db_pass }}"

View file

@ -32,13 +32,13 @@
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
roles: roles:
- /srv/web/infra/ansible/roles/base - base
- /srv/web/infra/ansible/roles/rkhunter - rkhunter
- /srv/web/infra/ansible/roles/denyhosts - denyhosts
- /srv/web/infra/ansible/roles/nagios_client - nagios_client
- /srv/web/infra/ansible/roles/geoip - geoip
- /srv/web/infra/ansible/roles/fas_client - fas_client
- /srv/web/infra/ansible/roles/mirrorlist - mirrorlist
tasks: tasks:
# this is how you include other task lists # this is how you include other task lists

View file

@ -32,12 +32,12 @@
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
roles: roles:
- /srv/web/infra/ansible/roles/base - base
- /srv/web/infra/ansible/roles/rkhunter - rkhunter
- /srv/web/infra/ansible/roles/denyhosts - denyhosts
- /srv/web/infra/ansible/roles/nagios_client - nagios_client
- /srv/web/infra/ansible/roles/fas_client - fas_client
- /srv/web/infra/ansible/roles/fedmsg_base - fedmsg_base
tasks: tasks:
- include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/hosts.yml"
@ -58,8 +58,8 @@
accelerate: True accelerate: True
roles: roles:
- /srv/web/infra/ansible/roles/fedmsg-hub - fedmsg-hub
- /srv/web/infra/ansible/roles/notifs-backend - notifs-backend
vars_files: vars_files:
- /srv/web/infra/ansible/vars/global.yml - /srv/web/infra/ansible/vars/global.yml

View file

@ -32,13 +32,13 @@
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
roles: roles:
- /srv/web/infra/ansible/roles/base - base
- /srv/web/infra/ansible/roles/rkhunter - rkhunter
- /srv/web/infra/ansible/roles/denyhosts - denyhosts
- /srv/web/infra/ansible/roles/nagios_client - nagios_client
- /srv/web/infra/ansible/roles/fas_client - fas_client
- /srv/web/infra/ansible/roles/fedmsg_base - fedmsg_base
- /srv/web/infra/ansible/roles/notifs-frontend - notifs-frontend
tasks: tasks:
- include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/hosts.yml"

View file

@ -32,11 +32,11 @@
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
roles: roles:
- /srv/web/infra/ansible/roles/base - base
- /srv/web/infra/ansible/roles/rkhunter - rkhunter
- /srv/web/infra/ansible/roles/denyhosts - denyhosts
- /srv/web/infra/ansible/roles/nagios_client - nagios_client
- /srv/web/infra/ansible/roles/fas_client - fas_client
tasks: tasks:
- include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/hosts.yml"
@ -64,7 +64,7 @@
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
roles: roles:
- /srv/web/infra/ansible/roles/fedmsg_base - fedmsg_base
handlers: handlers:
- include: "{{ handlers }}/restart_services.yml" - include: "{{ handlers }}/restart_services.yml"
@ -81,7 +81,7 @@
- "{{ vars_path }}/{{ ansible_distribution }}.yml" - "{{ vars_path }}/{{ ansible_distribution }}.yml"
roles: roles:
- /srv/web/infra/ansible/roles/nuancier - nuancier
handlers: handlers:
- include: "{{ handlers }}/restart_services.yml" - include: "{{ handlers }}/restart_services.yml"

View file

@ -33,12 +33,12 @@
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
roles: roles:
- /srv/web/infra/ansible/roles/base - base
- /srv/web/infra/ansible/roles/rkhunter - rkhunter
- /srv/web/infra/ansible/roles/denyhosts - denyhosts
- /srv/web/infra/ansible/roles/nagios_client - nagios_client
- /srv/web/infra/ansible/roles/fas_client - fas_client
- /srv/web/infra/ansible/roles/postgresql_server - postgresql_server
tasks: tasks:
- include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/hosts.yml"

View file

@ -34,8 +34,8 @@
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
roles: roles:
- /srv/web/infra/ansible/roles/base - base
- /srv/web/infra/ansible/roles/nagios_client - nagios_client
tasks: tasks:
- include: "{{ tasks }}/koji/releng_config.yml" - include: "{{ tasks }}/koji/releng_config.yml"

View file

@ -29,12 +29,12 @@
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
roles: roles:
- /srv/web/infra/ansible/roles/base - base
- /srv/web/infra/ansible/roles/rkhunter - rkhunter
- /srv/web/infra/ansible/roles/denyhosts - denyhosts
- /srv/web/infra/ansible/roles/nagios_client - nagios_client
- /srv/web/infra/ansible/roles/fas_client - fas_client
- /srv/web/infra/ansible/roles/yum-cron - yum-cron
tasks: tasks:
# this is how you include other task lists # this is how you include other task lists

View file

@ -14,12 +14,12 @@
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
roles: roles:
- /srv/web/infra/ansible/roles/base - base
- /srv/web/infra/ansible/roles/rkhunter - rkhunter
- /srv/web/infra/ansible/roles/denyhosts - denyhosts
- /srv/web/infra/ansible/roles/nagios_client - nagios_client
- /srv/web/infra/ansible/roles/fas_client - fas_client
- /srv/web/infra/ansible/roles/iscsi_client - iscsi_client
tasks: tasks:
- include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/hosts.yml"

View file

@ -23,7 +23,7 @@
# Roles are run first, before tasks, regardless of where you place them here. # Roles are run first, before tasks, regardless of where you place them here.
roles: roles:
- /srv/web/infra/ansible/roles/fedmsg_base - fedmsg_base
tasks: tasks:
- include: "{{ tasks }}/cloud_setup_basic.yml" - include: "{{ tasks }}/cloud_setup_basic.yml"

View file

@ -117,7 +117,7 @@
- "{{ vars_path }}/{{ ansible_distribution }}.yml" - "{{ vars_path }}/{{ ansible_distribution }}.yml"
roles: roles:
- role: /srv/web/infra/ansible/roles/mailman - role: mailman
mailman_dbserver: localhost mailman_dbserver: localhost
mailman_postfix_mydestination: lists-dev.cloud.fedoraproject.org mailman_postfix_mydestination: lists-dev.cloud.fedoraproject.org
mailman_mm_db_pass: "{{ lists_dev_mm_db_pass }}" mailman_mm_db_pass: "{{ lists_dev_mm_db_pass }}"

View file

@ -13,11 +13,11 @@
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
roles: roles:
- /srv/web/infra/ansible/roles/base - base
- /srv/web/infra/ansible/roles/rkhunter - rkhunter
- /srv/web/infra/ansible/roles/denyhosts - denyhosts
- /srv/web/infra/ansible/roles/nagios_client - nagios_client
- /srv/web/infra/ansible/roles/fas_client - fas_client
tasks: tasks:
# this is how you include other task lists # this is how you include other task lists

View file

@ -17,8 +17,8 @@
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
roles: roles:
- /srv/web/infra/ansible/roles/base - base
- /srv/web/infra/ansible/roles/rkhunter - rkhunter
tasks: tasks:
- include: "{{ tasks }}/serialgetty.yml" - include: "{{ tasks }}/serialgetty.yml"