diff options
| -rw-r--r-- | manifests/master.pp | 14 |
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") } } |