aboutsummaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2010-02-18 00:16:58 -0200
committerSilvio Rhatto <rhatto@riseup.net>2010-02-18 00:16:58 -0200
commitf3ffa5c8fecd2afd180bf230c43278597bd00ef2 (patch)
tree09c383ca2b2801a61bfa3cb9511b4ff7ac6046d1 /manifests
parentc97080a44376393fc49c1d6920789757e03a3efc (diff)
downloadpuppet-nodo-f3ffa5c8fecd2afd180bf230c43278597bd00ef2.tar.gz
puppet-nodo-f3ffa5c8fecd2afd180bf230c43278597bd00ef2.tar.bz2
Trying to fix munin definitions
Diffstat (limited to 'manifests')
-rw-r--r--manifests/init.pp12
-rw-r--r--manifests/munin.pp6
2 files changed, 9 insertions, 9 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 15bbf90..9820b10 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -27,7 +27,7 @@ class nodo {
# We include munin configuration if it's not defined by
# and exported resource.
- if !defined(Nodo::vserver::munin[$hostname]) {
+ if !defined(Munin[$hostname]) {
include munin::client
}
@@ -185,14 +185,8 @@ class nodo::vserver inherits nodo {
dohwinfo => false,
}
- define munin($type, $id) {
- # Use one port for each node
- $munin_port = "59$id"
- include munin::client
- }
-
# Apply munin configuration for this node
- Nodo::vserver::munin <| tag == $name |>
+ Munin <| tag == $name |>
# Define a vserver instance
define instance($context, $ensure = 'running', $proxy = false, $puppetmaster = false, $gitd = false,
@@ -227,7 +221,7 @@ class nodo::vserver inherits nodo {
}
# Create a munin virtual resource to be realized in the node
- @nodo::vserver::munin {
+ @munin {
id => $id,
tag => $name,
}
diff --git a/manifests/munin.pp b/manifests/munin.pp
new file mode 100644
index 0000000..461a863
--- /dev/null
+++ b/manifests/munin.pp
@@ -0,0 +1,6 @@
+# Define a munin node with custom port
+define munin($type, $id) {
+ # Use one port for each node
+ $munin_port = "59$id"
+ include munin::client
+}