aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2010-02-19 00:31:43 -0200
committerSilvio Rhatto <rhatto@riseup.net>2010-02-19 00:31:43 -0200
commitbf7260844723334534d1712bb3e89906018494c5 (patch)
treeb18ca0ed3c1a74f4136f23a954b814d8be5e55da
parentedf5be6911a7133682e4bc2a558f28ac670eed0a (diff)
downloadpuppet-nodo-bf7260844723334534d1712bb3e89906018494c5.tar.gz
puppet-nodo-bf7260844723334534d1712bb3e89906018494c5.tar.bz2
Enhanced munin_node definition
-rw-r--r--manifests/init.pp7
-rw-r--r--manifests/munin.pp21
2 files changed, 20 insertions, 8 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 50b0502..8c44f99 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -182,12 +182,12 @@ class nodo::vserver inherits nodo {
}
# Apply munin configuration for this node
- Munin_node <<| tag == $hostname |>>
+ Munin_node <<| title == $hostname |>>
# We include munin configuration if it's not defined by
# and exported resource.
if !defined(munin::client) {
- include munin::client
+ munin_node { "$hostname": }
}
# Define a vserver instance
@@ -224,8 +224,7 @@ class nodo::vserver inherits nodo {
# Create a munin virtual resource to be realized in the node
@@munin_node { "$name":
- id => $id,
- tag => $name,
+ port => "49$id",
}
# Sound support
diff --git a/manifests/munin.pp b/manifests/munin.pp
index 1795226..f0dac88 100644
--- a/manifests/munin.pp
+++ b/manifests/munin.pp
@@ -1,6 +1,19 @@
-# Define a munin node with custom port
-define munin_node($id) {
- # Use one port for each node
- $munin_port = "49$id"
+# Define a munin node
+define munin_node($port = '4949') {
+
+ case $global_munin_allow {
+ '': { fail("Please set \$global_munin_allow in your site config") }
+ }
+
+ $munin_allow = $node_munin_allow ? {
+ '' => $global_munin_allow,
+ default => $node_munin_allow,
+ }
+
+ $munin_port = $node_munin_port ? {
+ '' => $port
+ default => $node_munin_port,
+ }
+
include munin::client
}