aboutsummaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2010-09-23 16:33:35 -0300
committerSilvio Rhatto <rhatto@riseup.net>2010-09-23 16:33:35 -0300
commitece22a6e46ccc93ca1df4386d919e9c1d24a9316 (patch)
treec938db35cf000e1812fd9cb9fb445673a4053a8a /manifests
parent57ccaaa9f3db378b6561460d5cfab37877dc0684 (diff)
downloadpuppet-nodo-ece22a6e46ccc93ca1df4386d919e9c1d24a9316.tar.gz
puppet-nodo-ece22a6e46ccc93ca1df4386d919e9c1d24a9316.tar.bz2
Rollback the last change and including puppetmasterd::disabled when needed
Diffstat (limited to 'manifests')
-rw-r--r--manifests/master.pp14
1 files changed, 6 insertions, 8 deletions
diff --git a/manifests/master.pp b/manifests/master.pp
index 1db4299..12f380c 100644
--- a/manifests/master.pp
+++ b/manifests/master.pp
@@ -3,10 +3,11 @@ class nodo::master {
'': { fail("You need to define if this is the main master! Please set \$main_master in host config") }
}
- # Puppetmaster should be included before nodo::vserver
- include puppetmasterd
-
if $main_master == true {
+ # Puppetmaster should be included before nodo::vserver
+ include puppetmasterd
+
+ include munin::host
include nagios::headless
include nagios::defaults
@@ -23,6 +24,8 @@ class nodo::master {
alias => ["puppet.$domain"],
}
} else {
+ include puppetmasterd::disabled
+
host { "puppet":
ensure => absent,
}
@@ -34,11 +37,6 @@ 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") }
}