Merge branch 'resolveinterval'

2015-05-26 08:28:52 +00:00 · 2015-05-26 08:28:52 +00:00 · c1872885c5
commit c1872885c5
parent 6fb89d54d0 c5ae02db25
3 changed files with 9 additions and 6 deletions
--- a/roles/collectd/base/files/network-client.conf
+++ b/roles/collectd/base/files/network-client.conf
@ -1,5 +0,0 @@
-LoadPlugin network
-
-<Plugin "network">
-        Server "log01"
-</Plugin>
--- a/roles/collectd/base/tasks/main.yml
+++ b/roles/collectd/base/tasks/main.yml
@ -23,7 +23,7 @@

 # install collectd-network config
 - name: /etc/collectd.d/network.conf
-  copy: src=network-client.conf dest=/etc/collectd.d/network.conf
+  template: src=network-client.conf.j2 dest=/etc/collectd.d/network.conf
  tags:
  - collectd
  notify:
--- a/roles/collectd/base/templates/network-client.conf.j2
+++ b/roles/collectd/base/templates/network-client.conf.j2
@ -0,0 +1,8 @@
+LoadPlugin network
+
+<Plugin "network">
+        Server "log01"
+        {% if ansible_distribution_major_version != '6' %}
+        ResolveInterval 14400
+        {% endif %}
+</Plugin>