From 02fbe41f0e4b681ddcb9b1e6b87afea60f047cf0 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Tue, 18 Feb 2014 00:49:22 +0000
Subject: [PATCH] Clean up new collectd role

---
 roles/collectd/tasks/main.yml                        | 6 +++---
 roles/collectd/{files => templates}/collectd.conf.j2 | 0
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename roles/collectd/{files => templates}/collectd.conf.j2 (100%)

diff --git a/roles/collectd/tasks/main.yml b/roles/collectd/tasks/main.yml
index 852146d9d6..08b79e3257 100644
--- a/roles/collectd/tasks/main.yml
+++ b/roles/collectd/tasks/main.yml
@@ -11,13 +11,13 @@
 
 # install collected.conf
 - name: /etc/collectd.conf
-  template: src="{{ files }}/collectd/collectd.conf.j2" dest=/etc/collectd.conf
+  template: src=collectd.conf.j2 dest=/etc/collectd.conf
   notify:
   - restart collectd
 
 # install collectd-network config
 - name: /etc/collectd.d/network.conf
-  copy: src="{{ files }}/collectd/network-client.conf" dest=/etc/collectd.d/network.conf
+  copy: src=network-client.conf dest=/etc/collectd.d/network.conf
   notify:
   - restart collectd
 
@@ -29,7 +29,7 @@
   when: collectd_apache is defined
 
 - name: /etc/collectd/apache.conf
-  copy: src="{{ files }}/collectd/apache.conf" dest=/etc/collectd.d/apache.conf
+  copy: src=apache.conf dest=/etc/collectd.d/apache.conf
   notify:
   - restart collectd
   when: collectd_apache is defined
diff --git a/roles/collectd/files/collectd.conf.j2 b/roles/collectd/templates/collectd.conf.j2
similarity index 100%
rename from roles/collectd/files/collectd.conf.j2
rename to roles/collectd/templates/collectd.conf.j2