From f047c5c38310c25a4f5483cd33caba6d73a42ab0 Mon Sep 17 00:00:00 2001 From: mh Date: Thu, 28 Feb 2013 20:23:10 +0100 Subject: this require is pretty useless, as if we have a require on the define, we do not need to pass it down --- manifests/plugin/deploy.pp | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) (limited to 'manifests') diff --git a/manifests/plugin/deploy.pp b/manifests/plugin/deploy.pp index 2928a3a..53f6481 100644 --- a/manifests/plugin/deploy.pp +++ b/manifests/plugin/deploy.pp @@ -2,7 +2,7 @@ define munin::plugin::deploy( $ensure = 'present', $source = '', - $config = '', + $config = '' ) { $plugin_src = $ensure ? { 'present' => $name, @@ -32,23 +32,12 @@ define munin::plugin::deploy( openbsd: { $basic_require = File['/var/run/munin'] } default: { $basic_require = Package['munin-node'] } } - if $require { - File["munin_plugin_${name}"]{ - require => [ $basic_require, $require ], - } - } else { - File["munin_plugin_${name}"]{ - require => $basic_require, - } + File["munin_plugin_${name}"]{ + require => $basic_require, } # register the plugin munin::plugin{$name: ensure => $ensure, config => $config } - if $require { - Munin::Plugin[$name]{ - require => $require - } - } } -- cgit v1.2.3