Using puppetmasterd:disabled when not main master

diff --git a/manifests/master.pp b/manifests/master.pp
index b07866e0a450f31c9c4bfe390924b742cc8562ac..e6d7722b719f3cff8c76fac1fc85d7f52322cd5e 100644 (file)
--- 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") }
   }