Trying to fix munin definitions (3)

diff --git a/manifests/init.pp b/manifests/init.pp
index 8e84900a1b62a85ffde94e01cf698a12264b1cbb..3e5fd23ce20e1dca5e294b88ec3ebfe8525cdc40 100644 (file)
--- 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(Munin[$hostname]) {
+  if !defined(Munin_node[$hostname]) {
     include munin::client
   }
 
@@ -145,10 +145,6 @@ class nodo::server inherits nodo {
   $sshd_listen_address = [ "$ipaddress" ]
   include sshd
 
-  # Munin
-  #$munin_port = "4901"
-  #include munin::client
-
   backupninja::sys { "sys":
     ensure => present,
   }
@@ -186,7 +182,7 @@ class nodo::vserver inherits nodo {
   }
 
   # Apply munin configuration for this node
-  Munin <| tag == $name |>
+  Munin_node <| tag == $name |>
 
   # Define a vserver instance
   define instance($context, $ensure = 'running', $proxy = false, $puppetmaster = false, $gitd = false,
@@ -221,7 +217,7 @@ class nodo::vserver inherits nodo {
     }
 
     # Create a munin virtual resource to be realized in the node
-    @munin { "$name":
+    @munin_node { "$name":
       id   => $id,
       tag  => $name,
     }

diff --git a/manifests/munin.pp b/manifests/munin.pp
index 461a8632083a73890d3f8578585e2f746d66e777..7c77daca2fe0fee7cabef66276a8dbada9f4e070 100644 (file)
--- a/manifests/munin.pp
+++ b/manifests/munin.pp
@@ -1,5 +1,5 @@
 # Define a munin node with custom port
-define munin($type, $id) {
+define munin_node($type, $id) {
   # Use one port for each node
   $munin_port = "59$id"
   include munin::client