summaryrefslogtreecommitdiff
path: root/manifests/client
diff options
context:
space:
mode:
authorGabriel Filion <gabster@lelutin.ca>2014-12-13 11:21:09 -0500
committerGabriel Filion <gabster@lelutin.ca>2014-12-13 11:21:09 -0500
commitacfaa47dbdb07805cb07eb72f552d0e9b03ba1c9 (patch)
tree861622211d28234516e4324de12624ef812b8a9e /manifests/client
parent48272434978f95c70e34aebe9ce188157f8f935e (diff)
create a single entry point to the module
The current state of the module makes it impossible to install a munin server with munin::host, since it depends on resources in munin::client (because of the plugins it installs). Even if we include the munin::client class "just before" munin::host, puppet thinks there are dependency issues. By moving arguments to a single point of entry we can then include all necessary items and puppet will find the needed resources correctly.
Diffstat (limited to 'manifests/client')
-rw-r--r--manifests/client/base.pp14
1 files changed, 7 insertions, 7 deletions
diff --git a/manifests/client/base.pp b/manifests/client/base.pp
index 6ed0f71..8ee8b95 100644
--- a/manifests/client/base.pp
+++ b/manifests/client/base.pp
@@ -26,19 +26,19 @@ class munin::client::base inherits munin::client::params {
owner => root,
group => 0,
}
- $host = $munin::client::host ? {
+ $host = $munin::host ? {
'*' => $::fqdn,
- default => $munin::client::host
+ default => $munin::host
}
munin::register { $::fqdn:
host => $host,
- port => $munin::client::port,
- use_ssh => $munin::client::use_ssh,
- description => $munin::client::description,
- group => $munin::client::munin_group,
+ port => $munin::port,
+ use_ssh => $munin::use_ssh,
+ description => $munin::description,
+ group => $munin::munin_group,
config => [ 'use_node_name yes', 'load.load.warning 5',
'load.load.critical 10'],
- export_tag => $munin::client::export_tag,
+ export_tag => $munin::export_tag,
}
include munin::plugins::base
}