Merge pull request redhat-openstack#210 from txaj/fix-booleans-pulled…

…-from-hiera

Ensure variable using 'false' will be interpreted.

templates/plugin/apache.conf.erb

@@ -8,10 +8,10 @@
 <% if values['password'] -%>
     Password "<%= values['password'] %>"
 <% end -%>
-<% if values['verifypeer'] -%>
+<% unless values['verifypeer'].nil? -%>
     VerifyPeer "<%= values['verifypeer'] %>"
 <% end -%>
-<% if values['verifyhost'] -%>
+<% unless values['verifyhost'].nil? -%>
     VerifyHost "<%= values['verifyhost'] %>"
 <% end -%>
 <% if values['cacert'] -%>

templates/plugin/bind.conf.erb

@@ -9,13 +9,13 @@
   MemoryStats <%= @memorystats %>
 <% @views.each do |view| -%>
   <View "<%= view['name'] %>">
-<% if view['qtypes'] -%>
+<% unless view['qtypes'].nil? -%>
     QTypes <%= view['qtypes'] %>
 <% end -%>
-<% if view['resolverstats'] -%>
+<% unless view['resolverstats'].nil? -%>
     ResolverStats <%= view['resolverstats'] %>
 <% end -%>
-<% if view['cacherrsets'] -%>
+<% unless view['cacherrsets'].nil? -%>
     CacheRRSets <%= view['cacherrsets'] %>
 <% end -%>
 <% if view['zones'] -%>

templates/plugin/match.tpl.erb

@@ -1,7 +1,7 @@
 <% @matches.each do |match| -%>
   <Match>
     Regex "<%= match['regex'] %>"
-<% if match['excluderegex'] -%>
+<% unless match['excluderegex'].nil? -%>
     ExcludeRegex "<%= match['excluderegex'] %>"
 <% end -%>
     DSType "<%= match['dstype'] %>"

templates/plugin/network.conf.erb

@@ -5,10 +5,10 @@
 <% if @maxpacketsize -%>
     MaxPacketSize <%= @maxpacketsize %>
 <% end -%>
-<% if @forward -%>
+<% unless @forward.nil? -%>
     Forward "<%= @forward %>"
 <% end -%>
-<% if @reportstats -%>
+<% unless @reportstats.nil? -%>
     ReportStats "<%= @reportstats %>"
 <% end -%>
 

templates/plugin/nginx.conf.erb

@@ -6,10 +6,10 @@
 <% if @password -%>
   Password "<%= @password %>"
 <% end -%>
-<% if @verifypeer -%>
+<% unless @verifypeer.nil? -%>
   VerifyPeer <%= @verifypeer %>
 <% end -%>
-<% if @verifyhost -%>
+<% unless @verifyhost.nil? -%>
   VerifyHost <%= @verifyhost %>
 <% end -%>
 <% if @cacert -%>

templates/plugin/postgresql/writer.conf.erb

@@ -1,6 +1,6 @@
   <Writer <%= @name %>>
     Statement "<%= @statement %>"
-<% if @storerates -%>
+<% unless @storerates.nil? -%>
     StoreRates <%= @storerates %>
 <% end -%>
   </Writer>

templates/plugin/rrdcached.conf.erb

@@ -1,10 +1,10 @@
 <Plugin rrdcached>
   DaemonAddress "<%= @daemonaddress %>"
   DataDir "<%= @datadir %>"
-<% unless @createfiles -%>
+<% unless @createfiles.nil? -%>
   CreateFiles "<%= @createfiles %>"
 <% end -%>
-<% if @createfilesasync -%>
+<% unless @createfilesasync.nil? -%>
   CreateFilesAsync "<%= @createfilesasync %>"
 <% end -%>
 <% if @stepsize -%>

templates/plugin/sensors.conf.erb

@@ -7,7 +7,7 @@
   Sensor "<%= @sensor %>"
 <% end -%>
 <% end -%>
-<% if @ignoreselected -%>
+<% unless @ignoreselected.nil? -%>
   IgnoreSelected "<%= @ignoreselected %>"
 <% end -%>
 </Plugin>

templates/plugin/statsd.conf.erb

@@ -5,16 +5,16 @@
 <% if @port -%>
   Port <%= @port %>
 <% end -%>
-<% if @deletecounters -%>
+<% unless @deletecounters.nil? -%>
   DeleteCounters <%= @deletecounters %>
 <% end -%>
-<% if @deletetimers -%>
+<% unless @deletetimers.nil? -%>
   DeleteTimers <%= @deletetimers %>
 <% end -%>
-<% if @deletegauges -%>
+<% unless @deletegauges.nil? -%>
   DeleteGauges <%= @deletegauges %>
 <% end -%>
-<% if @deletesets -%>
+<% unless @deletesets.nil? -%>
   Deletesets <%= @deletesets %>
 <% end -%>
 <% if @timerpercentile -%>

templates/plugin/write_http.conf.erb

@@ -7,10 +7,10 @@
 <% if values['password'] -%>
     Password "<%= values['password'] %>"
 <% end -%>
-<% if values['verifypeer'] -%>
+<% unless values['verifypeer'].nil? -%>
     VerifyPeer "<%= values['verifypeer'] %>"
 <% end -%>
-<% if values['verifyhost'] -%>
+<% unless values['verifyhost'].nil? -%>
     VerifyHost "<%= values['verifyhost'] %>"
 <% end -%>
 <% if values['cacert'] -%>