summaryrefslogtreecommitdiff
path: root/manifests/puppetmaster.pp
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2010-08-06 22:10:39 +0200
committermh <mh@immerda.ch>2010-08-06 22:11:58 +0200
commit4036ecf691babf80d859b68865e66cea0008a238 (patch)
tree9fa165d448b560077af447c1acf9132a1bb8957c /manifests/puppetmaster.pp
parentdcdf341af2b32969c47bef5939e34952a6fc7642 (diff)
cleanup 'if defined' code smell
A new variable $puppetmaster_mode have been introduced, which should later be replaced by a class variable.
Diffstat (limited to 'manifests/puppetmaster.pp')
-rw-r--r--manifests/puppetmaster.pp7
1 files changed, 7 insertions, 0 deletions
diff --git a/manifests/puppetmaster.pp b/manifests/puppetmaster.pp
index f9f4306..5f3ad16 100644
--- a/manifests/puppetmaster.pp
+++ b/manifests/puppetmaster.pp
@@ -13,6 +13,13 @@ class puppet::puppetmaster inherits puppet {
include puppet::puppetmaster::base
include puppet::puppetmaster::checklastrun
+ if $puppetmaster_mode == 'passenger' {
+ include puppet::puppetmaster::pasenger
+ } elsif $puppetmaster_mode == 'cluster' {
+ include puppet::puppetmaster::cluster
+ }
+
+
if $use_shorewall {
include shorewall::rules::puppet::master
}