From 3153fb747271971dd310ab902b8958b9f3ea4ecf Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 18 Feb 2010 00:29:21 -0200
Subject: Trying to fix munin definitions (3)

---
 manifests/init.pp | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'manifests/init.pp')

diff --git a/manifests/init.pp b/manifests/init.pp
index 8e84900..3e5fd23 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(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,
     }
-- 
cgit v1.2.3