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

playbooks/groups/arm-packager.yml

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

playbooks/groups/arm-qa.yml

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

playbooks/groups/arm-releng.yml

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

playbooks/groups/ask.yml

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

playbooks/groups/backup-server.yml

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

playbooks/groups/badges-backend.yml

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

playbooks/groups/badges-web.yml

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

playbooks/groups/beaker.yml

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

playbooks/groups/bkernel.yml

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

playbooks/groups/buildhw.yml

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

playbooks/groups/buildvm.yml

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

playbooks/groups/docs-backend.yml

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

playbooks/groups/elections.yml

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

playbooks/groups/fedocal.yml

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

playbooks/groups/gallery.yml

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

playbooks/groups/jenkins-cloud.yml

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

playbooks/groups/keyserver.yml

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

playbooks/groups/koji-hub.yml

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

playbooks/groups/lockbox.yml

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

playbooks/groups/mailman.yml

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

playbooks/groups/mirrorlist.yml

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

playbooks/groups/notifs-backend.yml

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

playbooks/groups/notifs-web.yml

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

playbooks/groups/nuancier.yml

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

playbooks/groups/postgresl-server.yml

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

playbooks/groups/releng.yml

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

playbooks/groups/taskotron.yml

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

playbooks/groups/virthost.yml

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

playbooks/hosts/copr-be.cloud.fedoraproject.org.yml

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

playbooks/hosts/lists-dev.cloud.fedoraproject.org.yml

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

playbooks/manual/kernel-qa.yml

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

playbooks/manual/sign.yml

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