From: drebs <drebs@riseup.net>
Date: Tue, 12 Aug 2014 13:01:34 +0000 (-0300)
Subject: Add puppet_standalone option for puppet::base.
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=9156132d33dfbe43a75144044e417493708b642b;p=puppet-nodo.git

Add puppet_standalone option for puppet::base.
---

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