Merge branch 'master' of /git/ansible

inventory/group_vars/mirrorlist

@@ -15,4 +15,6 @@ install_command: /usr/sbin/virt-install -n ${inventory_hostname} -r ${mem_size}
 # for systems that do not match the above - specify the same parameter in
 # the host_vars/$hostname file
 
-tcp_ports: [ 80 ]
+tcp_ports: [ 80 ]
+collectd_apache: true
+

tasks/collectd/client.yml

@@ -16,8 +16,8 @@
   - restart collectd
 
 # install collectd-network config
-- name: /etc/collectd.d/nework.conf
-  copy: src=$files/collectd/network-client.conf dest=/etc/collectd/network.conf
+- name: /etc/collectd.d/network.conf
+  copy: src=$files/collectd/network-client.conf dest=/etc/collectd.d/network.conf
   notify:
   - restart collectd
 
@@ -29,7 +29,7 @@
   when_set: $collectd_apache
 
 - name: /etc/collectd/apache.conf
-  copy: src=$files/collectd/apache.conf dest=/etc/collectd/apache.conf
+  copy: src=$files/collectd/apache.conf dest=/etc/collectd.d/apache.conf
   notify:
   - restart collectd
   when_set: $collectd_apache

tasks/mirrorlist.yml

@@ -26,7 +26,7 @@
 
 # nuke mirrormanager.conf so that it doesn't start up
 - name: kill /etc/httpd/conf.d/mirrrormanager.conf
-  copy: content="blanked on purpose" dest=/etc/httpd/conf.d/mirrormanager.conf 
+  copy: 'content="#blanked on purpose" dest=/etc/httpd/conf.d/mirrormanager.conf'
   notify:
   - restart apache
   tags: