summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2013-02-28 20:23:10 +0100
committermh <mh@immerda.ch>2013-02-28 20:23:10 +0100
commitf047c5c38310c25a4f5483cd33caba6d73a42ab0 (patch)
tree47eb9131b780013075f59e839252a91101134917 /manifests
parent61cfbbf42268045b0d4f0dc0481b962e9aad9f8f (diff)
this require is pretty useless, as if we have a require on the define, we do not need to pass it down
Diffstat (limited to 'manifests')
-rw-r--r--manifests/plugin/deploy.pp17
1 files changed, 3 insertions, 14 deletions
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
- }
- }
}