aboutsummaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2010-02-17 23:00:10 -0200
committerSilvio Rhatto <rhatto@riseup.net>2010-02-17 23:00:10 -0200
commit838dbb93c65e7c43662bc4f891a7055f7794e0a4 (patch)
tree1101054c3f08052636d53d17b45cd5d0f9352767 /manifests
parentfff581b8224b9286b79b031fa7c60997751c8d34 (diff)
downloadpuppet-nodo-838dbb93c65e7c43662bc4f891a7055f7794e0a4.tar.gz
puppet-nodo-838dbb93c65e7c43662bc4f891a7055f7794e0a4.tar.bz2
Including munin::client everywhere
Diffstat (limited to 'manifests')
-rw-r--r--manifests/init.pp12
1 files changed, 1 insertions, 11 deletions
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") }