Merge pull request #49 from kjetilho/issue/plugin_target

unset $plugin_target bombs on Puppet 4+
ssm · Nov 17, 2017 · 044bcc0 · 044bcc0
2 parents 89400bb + 081a5d4
commit 044bcc0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 10 deletions.
diff --git a/Rakefile b/Rakefile
@@ -34,7 +34,7 @@ PuppetLint.configuration.relative = true
 PuppetLint.configuration.disable_80chars
 PuppetLint.configuration.disable_class_inherits_from_params_class
 PuppetLint.configuration.disable_class_parameter_defaults
-PuppetLint.configuration.fail_on_warnings = true
+PuppetLint.configuration.fail_on_warnings = false
 
 PuppetLint::RakeTask.new :lint do |config|
   config.ignore_paths = exclude_paths

diff --git a/manifests/master/node_definition.pp b/manifests/master/node_definition.pp
@@ -24,7 +24,7 @@
 )
 {
 
-  include munin::params::master
+  include ::munin::params::master
 
   $config_root = $munin::params::master::config_root
 

diff --git a/manifests/node/export.pp b/manifests/node/export.pp
@@ -16,8 +16,8 @@
     tag        => "munin::master::${mastername}",
   }
   @@munin::master::node_definition{ $fqn:
-    address    => $address,
-    config     => $masterconfig,
+    address => $address,
+    config  => $masterconfig,
   }
   if ! empty($node_definitions) {
     create_resources('@@munin::master::node_definition', $node_definitions)

diff --git a/manifests/plugin.pp b/manifests/plugin.pp
@@ -32,13 +32,10 @@
 
     validate_re($ensure, '^(|link|present|absent)$')
     case $ensure {
-        'present': {
+        'present', 'absent': {
             $handle_plugin = true
-            $plugin_ensure = 'present'
-        }
-        'absent': {
-            $handle_plugin = true
-            $plugin_ensure = 'absent'
+            $plugin_ensure = $ensure
+            $plugin_target = undef
         }
         'link': {
             $handle_plugin = true