From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 18 Feb 2010 01:00:10 +0000 (-0200)
Subject: Including munin::client everywhere
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=838dbb93c65e7c43662bc4f891a7055f7794e0a4;p=puppet-nodo.git

Including munin::client everywhere
---

diff --git a/manifests/init.pp b/manifests/init.pp
index 33b485f..328e71d 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -24,6 +24,7 @@ class nodo {
   include motd
   include utils
   include cron
+  include munin::client
 
   # Set timezone and ntp config
   #
@@ -193,9 +194,6 @@ class nodo::vserver inherits nodo {
     }
   }
 
-  # Apply the munin configuration for this host
-  #Nodo::vserver::munin <| tag == $name |>
-
   # Define a vserver instance
   define instance($context, $ensure = 'running', $proxy = false, $puppetmaster = false, $gitd = false,
                   $munin = 'client', $icecast = false, $sound = false, $ticket = false) {
@@ -228,13 +226,6 @@ class nodo::vserver inherits nodo {
       require => Exec["vs_create_${name}"],
     }
 
-    # Create a munin virtual resource to be realized in the node
-    #@nodo::vserver::munin {
-    #  type => $munin,
-    #  id   => $id,
-    #  tag  => $name,
-    #}
-
     # Sound support
     if $sound {
       if !defined(File["/usr/local/sbin/create-sound-devices"]) {
@@ -416,7 +407,6 @@ class nodo::master {
   include database
   include gitosis
   include websites::admin
-  include munin::client
 
   case $main_master {
     '': { fail("You need to define if this is the main master! Please set \$main_master in host config") }