aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordrebs <drebs@riseup.net>2014-08-12 10:01:34 -0300
committerdrebs <drebs@riseup.net>2014-08-12 16:20:09 -0300
commit9156132d33dfbe43a75144044e417493708b642b (patch)
tree3282c5f51154444135bf4173f9414f4c92f3e1a8
parent6bc448e657f9d793a67844674c510977165b2169 (diff)
downloadpuppet-nodo-9156132d33dfbe43a75144044e417493708b642b.tar.gz
puppet-nodo-9156132d33dfbe43a75144044e417493708b642b.tar.bz2
Add puppet_standalone option for puppet::base.
-rw-r--r--manifests/base.pp11
1 files changed, 7 insertions, 4 deletions
diff --git a/manifests/base.pp b/manifests/base.pp
index 687619d..62dc37d 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -1,4 +1,6 @@
-class nodo::base {
+class nodo::base(
+ $puppet_standalone = hiera('nodo::base::puppet_standalone', false)
+){
# First include the LSB class
include lsb
@@ -30,9 +32,10 @@ class nodo::base {
# Require admin accounts' class
require users::admin
- # Puppet daemon
- class { 'puppet::daemon':
- master => hiera('nodo::role::master::main', false)
+ # Puppet
+ case $puppet_standalone {
+ true: { include puppet::standalone }
+ false: { include puppet::daemon }
}
# Does not work well inside vservers