aboutsummaryrefslogtreecommitdiff
path: root/manifests/base.pp
diff options
context:
space:
mode:
Diffstat (limited to 'manifests/base.pp')
-rw-r--r--manifests/base.pp13
1 files changed, 8 insertions, 5 deletions
diff --git a/manifests/base.pp b/manifests/base.pp
index b8a16e9..df3dd31 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -1,5 +1,5 @@
class nodo::base(
- $puppet_standalone = hiera('nodo::base::puppet_standalone', false)
+ $puppet_mode = hiera('nodo::base::puppet_mode', 'daemon')
){
# First include the LSB class
include lsb
@@ -30,16 +30,19 @@ class nodo::base(
include cron
# Require admin accounts' class
- require users::admin
+ if (defined(site_users::admin)) {
+ include site_users::admin
+ }
# Puppet
- case $puppet_standalone {
- true: { include puppet::standalone }
- false: {
+ case $puppet_mode {
+ 'standalone': { include puppet::standalone }
+ 'daemon': {
class { 'puppet::daemon':
master => hiera('nodo::role::master::main', false),
}
}
+ default: { }
}
# Does not work well inside vservers