fix gmetad.conf handling of an undefined gridname param

seattle-biomed · Dec 15, 2013 · ebccc4b · ebccc4b
1 parent be89a48
commit ebccc4b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/manifests/gmetad.pp b/manifests/gmetad.pp
@@ -47,7 +47,7 @@
 
 class ganglia::gmetad(
   $clusters = [ { 'name' => 'my cluster', 'address' => 'localhost' } ],
-  $gridname = '',
+  $gridname = undef,
 ) inherits ganglia::params {
   validate_array($clusters)
   validate_string($gridname)

diff --git a/templates/gmetad.conf.el6.erb b/templates/gmetad.conf.el6.erb
@@ -67,7 +67,7 @@ data_source "<%= data_source['name'] -%>"<% if data_source['polling_interval'] t
 # The name of this Grid. All the data sources above will be wrapped in a GRID
 # tag with this name.
 # default: unspecified
-<% if @gridname then -%>
+<% unless @gridname.nil? -%>
 gridname "<%= @gridname %>"
 <% else -%>
 # gridname "MyGrid"