aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2010-09-23 16:09:04 -0300
committerSilvio Rhatto <rhatto@riseup.net>2010-09-23 16:09:04 -0300
commit57ccaaa9f3db378b6561460d5cfab37877dc0684 (patch)
treec8cbe9ec9b39b2c1198789974fbf8e155d49b857
parent47ab4d5841bab616bada412c212491261729452f (diff)
downloadpuppet-nodo-57ccaaa9f3db378b6561460d5cfab37877dc0684.tar.gz
puppet-nodo-57ccaaa9f3db378b6561460d5cfab37877dc0684.tar.bz2
Including munin::host after munin::client
-rw-r--r--manifests/master.pp6
1 files changed, 5 insertions, 1 deletions
diff --git a/manifests/master.pp b/manifests/master.pp
index 23b78d2..1db4299 100644
--- a/manifests/master.pp
+++ b/manifests/master.pp
@@ -7,7 +7,6 @@ class nodo::master {
include puppetmasterd
if $main_master == true {
- include munin::host
include nagios::headless
include nagios::defaults
@@ -35,6 +34,11 @@ class nodo::master {
include gitosis
include websites::admin
+ # Munin configuration
+ if $main_master == true {
+ include munin::host
+ }
+
case $puppetmaster_db_password {
'': { fail("Please set \$puppetmaster_db_password in your host config") }
}