Merge pull request #5 from tokyowizard/fix/boolean

fix boolean check for use_librato and use_graphite
AerisCloud · Feb 29, 2016 · 89e01bb · 89e01bb
2 parents 562a254 + 2322a90
commit 89e01bb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/tasks/main.yml b/tasks/main.yml
@@ -31,7 +31,7 @@
     owner=root
     group=root
     mode=0644
-  when: use_librato and collectd_forwarder is defined and collectd_forwarder == inventory_hostname
+  when: use_librato|bool and collectd_forwarder is defined and collectd_forwarder == inventory_hostname
   notify:
     - Restart collectd
   tags:

diff --git a/templates/collectd.conf.j2 b/templates/collectd.conf.j2
@@ -82,7 +82,7 @@ LoadPlugin interface
 	IgnoreSelected true
 </Plugin>
 
-{% if monitor_coretemp %}
+{% if monitor_coretemp|bool %}
 <Plugin exec>
   Exec nobody "/opt/collectd-exec-modules/collectd-coretemp.sh"
 </Plugin>
@@ -105,7 +105,7 @@ LoadPlugin rrdtool
 
 LoadPlugin network
 <Plugin network>
-    {% if collectd_forwarder is defined and collectd_forward_to_logstash %}
+    {% if collectd_forwarder is defined and collectd_forward_to_logstash|bool %}
 	<Server "{{ hostvars[collectd_forwarder]['private_ip']|default(hostvars[collectd_forwarder]['ansible_ssh_host']) }}" "25827">
 		Interface "{{ private_interface }}"
 	</Server>
@@ -144,7 +144,7 @@ LoadPlugin df
 LoadPlugin python
 
 {% if collectd_forwarder is defined and collectd_forwarder == inventory_hostname  %}
-{% if use_graphite %}
+{% if use_graphite|bool %}
 <LoadPlugin write_graphite>
     Interval     {{ graphite_interval|default('10') }}
 </LoadPlugin>