Merge pull request #134 from alexjfisher/configure_lookup_options_in_…

…hiera

Move lookup_options to hiera

data/defaults.yaml

@@ -0,0 +1,6 @@
+---
+lookup_options:
+  'telegraf::inputs':
+    merge: 'deep'
+  'telegraf::outputs':
+    merge: 'deep'

hiera.yaml

@@ -0,0 +1,10 @@
+---
+version: 5
+
+defaults:
+  datadir: 'data'
+  data_hash: yaml_data
+
+hierarchy:
+  - name: 'defaults'
+    path: 'defaults.yaml'

manifests/init.pp

@@ -135,17 +135,6 @@
   $service_hasstatus = $telegraf::params::service_hasstatus
   $service_restart   = $telegraf::params::service_restart
 
-  $_outputs = lookup({
-    name          => 'telegraf::outputs',
-    default_value => $outputs,
-    merge         => deep,
-  })
-  $_inputs = lookup({
-    name          => 'telegraf::inputs',
-    default_value => $inputs,
-    merge         => deep,
-  })
-
   contain telegraf::install
   contain telegraf::config
   contain telegraf::service

templates/telegraf.conf.erb

@@ -24,16 +24,12 @@
   debug = <%= @debug %>
   quiet = <%= @quiet %>
 
-<% if @_outputs -%>
 #
 # OUTPUTS:
 #
-<%= require 'toml-rb'; TomlRB.dump({'outputs'=>@_outputs}) %>
-<% end -%>
+<%= require 'toml-rb'; TomlRB.dump({'outputs'=>@outputs}) %>
 
-<% if @_inputs -%>
 #
 # INPUTS:
 #
-<%= require 'toml-rb'; TomlRB.dump({'inputs'=>@_inputs}) %>
-<% end -%>
+<%= require 'toml-rb'; TomlRB.dump({'inputs'=>@inputs}) %>