Fix hiera_merge behavior (#28)

Fixes #27. This wasn't implemented correctly in #25. The `$telegraf::params::inputs` and `$telegraf::params::outputs` values are never read because they are only provided as a default value.
voxpupuli · Jun 1, 2016 · 627c93e · 627c93e
1 parent bf45b4b
commit 627c93e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -96,6 +96,12 @@
   validate_bool($manage_service)
   validate_bool($manage_repo)
 
+  # currently the only way how to obtain merged hashes
+  # from multiple files (`:merge_behavior: deeper` needs to be
+  # set in your `hiera.yaml`)
+  $_outputs = hiera_hash('telegraf::outputs', $outputs)
+  $_inputs = hiera_hash('telegraf::inputs', $inputs)
+
   contain ::telegraf::install
   contain ::telegraf::config
   contain ::telegraf::service

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -20,22 +20,19 @@
   $manage_service         = true
   $manage_repo            = true
 
-  # currently the only way how to obtain merged hashes
-  # from multiple files (`:merge_behavior: deeper` needs to be
-  # set in your `hiera.yaml`)
-  $outputs = hiera_hash('telegraf::outputs', {
+  $outputs = {
     'influxdb'  => {
       'urls'     => [ 'http://localhost:8086' ],
       'database' => 'telegraf',
       'username' => 'telegraf',
       'password' => 'metricsmetricsmetrics',
     }
-  })
+  }
 
-  $inputs = hiera_hash('telegraf::inputs', {
+  $inputs = {
     'cpu'  => {
       'percpu'   => true,
       'totalcpu' => true,
     }
-  })
+  }
 }
diff --git a/templates/telegraf.conf.erb b/templates/telegraf.conf.erb
@@ -21,11 +21,11 @@
   debug = <%= @debug %>
   quiet = <%= @quiet %>
 
-<% if @outputs -%>
+<% if @_outputs -%>
 #
 # OUTPUTS:
 #
-<%   @outputs.sort.each do | output, options | -%>
+<%   @_outputs.sort.each do | output, options | -%>
 [[outputs.<%= output %>]]
 <%      unless options == nil -%>
 <%          options.sort.each do | option, value | -%>
@@ -35,11 +35,11 @@
 <%   end -%>
 <% end -%>
 
-<% if @inputs -%>
+<% if @_inputs -%>
 #
 # INPUTS:
 #
-<%   @inputs.sort.each do | input, options | -%>
+<%   @_inputs.sort.each do | input, options | -%>
 [[inputs.<%= input %>]]
 <%      unless options == nil -%>
 <%          options.sort.each do | option, value | -%>