Move collectd to a role instead of a task.

playbooks/groups/ask.yml

@@ -33,6 +33,7 @@
   - denyhosts
   - nagios_client
   - fas_client
+  - collectd
   - ask
   - fedmsg_base
 
@@ -46,7 +47,6 @@
     when: env != "staging"
   - include: "{{ tasks }}/apache.yml"
   - include: "{{ tasks }}/mod_wsgi.yml"
-  - include: "{{ tasks }}/collectd/client.yml"
 
   handlers:
   - include: "{{ handlers }}/restart_services.yml"

playbooks/groups/beaker.yml

@@ -34,13 +34,13 @@
   - denyhosts
   - nagios_client
   - fas_client
+  - collectd
 
   tasks:
   # this is how you include other task lists
   - include: "{{ tasks }}/hosts.yml"
   - include: "{{ tasks }}/yumrepos.yml"
   - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/collectd/client.yml"
   - include: "{{ tasks }}/motd.yml"
   - include: "{{ tasks }}/sudo.yml"
 

playbooks/groups/docs-backend.yml

@@ -30,6 +30,7 @@
   - denyhosts
   - nagios_client
   - fas_client
+  - collectd
   - yum-cron
 
   tasks:
@@ -37,7 +38,6 @@
   - include: "{{ tasks }}/hosts.yml"
   - include: "{{ tasks }}/yumrepos.yml"
   - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/collectd/client.yml"
   - include: "{{ tasks }}/motd.yml"
   - include: "{{ tasks }}/sudo.yml"
 

playbooks/groups/koji-hub.yml

@@ -36,6 +36,7 @@
   - denyhosts
   - nagios_client
   - fas_client
+  - collectd
   - koji_hub
 
   tasks:
@@ -44,7 +45,6 @@
   - include: "{{ tasks }}/2fa_client.yml"
   - include: "{{ tasks }}/motd.yml"
   - include: "{{ tasks }}/sudo.yml"
-  - include: "{{ tasks }}/collectd/client.yml"
 
   handlers:
   - include: "{{ handlers }}/restart_services.yml"

playbooks/groups/mailman.yml

@@ -37,6 +37,7 @@
   - denyhosts
   - nagios_client
   - fas_client
+  - collectd
   - yum-cron
 
   tasks:
@@ -44,7 +45,6 @@
   - include: "{{ tasks }}/hosts.yml"
   - include: "{{ tasks }}/yumrepos.yml"
   - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/collectd/client.yml"
   - include: "{{ tasks }}/motd.yml"
   - include: "{{ tasks }}/sudo.yml"
   - include: "{{ tasks }}/apache.yml"

playbooks/groups/mirrorlist.yml

@@ -38,6 +38,7 @@
   - nagios_client
   - geoip
   - fas_client
+  - collectd
   - mirrorlist
 
   tasks:
@@ -45,7 +46,6 @@
   - include: "{{ tasks }}/hosts.yml"
   - include: "{{ tasks }}/yumrepos.yml"
   - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/collectd/client.yml"
   - include: "{{ tasks }}/openvpn_client.yml"
   - include: "{{ tasks }}/motd.yml"
   - include: "{{ tasks }}/sudo.yml"

playbooks/groups/postgresl-server.yml

@@ -38,6 +38,7 @@
   - denyhosts
   - nagios_client
   - fas_client
+  - collectd
   - postgresql_server
 
   tasks:
@@ -46,7 +47,6 @@
   - include: "{{ tasks }}/2fa_client.yml"
   - include: "{{ tasks }}/motd.yml"
   - include: "{{ tasks }}/sudo.yml"
-  - include: "{{ tasks }}/collectd/client.yml"
 
 # TODO: add iscsi task
 

playbooks/groups/releng.yml

@@ -36,12 +36,12 @@
   roles:
   - base
   - nagios_client
+  - collectd
 
   tasks:
   - include: "{{ tasks }}/koji/releng_config.yml"
   - include: "{{ tasks }}/hosts.yml"
   - include: "{{ tasks }}/motd.yml"
-  - include: "{{ tasks }}/collectd/client.yml"
 
   handlers:
   - include: "{{ handlers }}/restart_services.yml"

playbooks/groups/taskotron.yml

@@ -34,6 +34,7 @@
   - denyhosts
   - nagios_client
   - fas_client
+  - collectd
   - yum-cron
 
   tasks:
@@ -41,7 +42,6 @@
   - include: "{{ tasks }}/hosts.yml"
   - include: "{{ tasks }}/yumrepos.yml"
   - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/collectd/client.yml"
   - include: "{{ tasks }}/motd.yml"
   - include: "{{ tasks }}/sudo.yml"
 

playbooks/groups/virthost.yml

@@ -19,6 +19,7 @@
   - denyhosts
   - nagios_client
   - fas_client
+  - collectd
   - iscsi_client
 
   tasks:
@@ -27,7 +28,6 @@
   - include: "{{ tasks }}/2fa_client.yml"
   - include: "{{ tasks }}/motd.yml"
   - include: "{{ tasks }}/sudo.yml"
-  - include: "{{ tasks }}/collectd/client.yml"
   - include: "{{ tasks }}/virthost.yml"
 
   handlers:

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

@@ -27,7 +27,6 @@
   - include: "{{ tasks }}/postfix_basic.yml"
   - include: "{{ tasks }}/hosts.yml"
   - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/collectd/client.yml"
   - include: "{{ tasks }}/motd.yml"
   - include: "{{ tasks }}/sudo.yml"
   - include: "{{ tasks }}/apache.yml"
@@ -125,6 +124,7 @@
     mailman_hk_db_pass: "{{ lists_dev_hk_db_pass }}"
     mailman_ks_admin_db_pass: "{{ lists_dev_ks_db_pass }}"
     mailman_ks_db_pass: "{{ lists_dev_ks_db_pass }}"
+  - collectd
 
   tasks: