aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--manifests/master.pp14
-rw-r--r--manifests/nodo.pp2
2 files changed, 9 insertions, 7 deletions
diff --git a/manifests/master.pp b/manifests/master.pp
index e355e8e..4c384b6 100644
--- a/manifests/master.pp
+++ b/manifests/master.pp
@@ -1,11 +1,11 @@
class nodo::master {
- case $main_master {
- '': { fail("You need to define if this is the main master! Please set \$main_master in host config") }
- }
+ $main_master = hiera('nodo::master::main', false)
if $main_master == true {
# Puppetmaster should be included before nodo::vserver
- include puppetmasterd
+ class { 'puppetmasterd':
+ main => true,
+ }
# This is a workaround to correctly set allowed hosts on munin
# client when the host is also present.
@@ -16,7 +16,7 @@ class nodo::master {
# Right now we don't need to bother with fixing $munin_port as
# we are running the munin host in the main master node but it's
# mandatory to fix $munin_allow so munin can connect into the node.
- $munin_allow = $global_munin_allow
+ $munin_allow = hiera('nodo::munin_node::host', '')
include munin::host
include munin::plugins::muninhost
@@ -29,7 +29,9 @@ class nodo::master {
alias => ["puppet.$domain"],
}
} else {
- include puppetmasterd::disabled
+ class { 'puppetmasterd':
+ main => false,
+ }
host { "puppet":
ensure => absent,
diff --git a/manifests/nodo.pp b/manifests/nodo.pp
index f0a6b21..d05e3d6 100644
--- a/manifests/nodo.pp
+++ b/manifests/nodo.pp
@@ -1,6 +1,5 @@
class nodo {
include lsb
- include puppetd
include sudo
include users::admin
include motd
@@ -13,6 +12,7 @@ class nodo {
include domain
include concat::setup
+ class { 'puppetd': }
class { 'backup': }
# Does not work well inside vservers