Changes on nodo::master

diff --git a/manifests/master.pp b/manifests/master.pp
index 41585247ff6e116364e174546fd20af1e6c0ef51..23b78d209d549c1dfe56c9d5cfb742b9c0e6e59c 100644 (file)
--- a/manifests/master.pp
+++ b/manifests/master.pp
@@ -4,13 +4,14 @@ class nodo::master {
   }
 
   # Puppetmaster should be included before nodo::vserver
+  include puppetmasterd
+
   if $main_master == true {
-    include puppetmasterd
     include munin::host
     include nagios::headless
     include nagios::defaults
 
-    # TODO: nagios apache workaround
+    # Nagios apache workaround
     file { "/etc/apache2/conf.d/nagios3.conf":
       ensure => absent,
     }
@@ -23,7 +24,6 @@ class nodo::master {
       alias  => ["puppet.$domain"],
     }
   } else {
-    include puppetmasterd::disabled
     host { "puppet":
       ensure => absent,
     }