aboutsummaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2010-05-29 15:09:43 -0300
committerSilvio Rhatto <rhatto@riseup.net>2010-05-29 15:09:43 -0300
commitb12016cac6d5445bd27c1d6abbdff88a4efc3d62 (patch)
tree0e749a6bd42bc87bb3567589fd2f6008af8f5510 /manifests
parent79b785e25afd663bb8de2d807b00485c60a8f998 (diff)
downloadpuppet-nodo-b12016cac6d5445bd27c1d6abbdff88a4efc3d62.tar.gz
puppet-nodo-b12016cac6d5445bd27c1d6abbdff88a4efc3d62.tar.bz2
Using puppetmasterd:disabled when not main master
Diffstat (limited to 'manifests')
-rw-r--r--manifests/master.pp16
1 files changed, 9 insertions, 7 deletions
diff --git a/manifests/master.pp b/manifests/master.pp
index b07866e..e6d7722 100644
--- a/manifests/master.pp
+++ b/manifests/master.pp
@@ -1,16 +1,11 @@
class nodo::master {
- # Puppetmaster should be included before nodo::vserver
- include puppetmasterd
- include nodo::vserver
- include database
- include gitosis
- include websites::admin
-
case $main_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
if $main_master == true {
+ include puppetmasterd
include munin::host
# The main master has a host entry pointing to itself, other
@@ -21,11 +16,18 @@ class nodo::master {
alias => ["puppet.$domain"],
}
} else {
+ include puppetmasterd::disabled
host { "puppet":
ensure => absent,
}
}
+ # These should be included after puppetmaster
+ include nodo::vserver
+ include database
+ include gitosis
+ include websites::admin
+
case $puppetmaster_db_password {
'': { fail("Please set \$puppetmaster_db_password in your host config") }
}