Adding puppet::master::passenger::disable_mongrel parameter

diff --git a/manifests/master/passenger.pp b/manifests/master/passenger.pp
index 01f1dac39cd02b2937fd6a0ffd89ca651c33e5ab..d14c2e75bb755f6635e936b45ecb6344bfe13ef9 100644 (file)
--- a/manifests/master/passenger.pp
+++ b/manifests/master/passenger.pp
@@ -1,7 +1,11 @@
 # handles puppetmasterd service
 class puppet::master::passenger {
-  # make sure we're not running mongrel
-  include puppet::master::mongrel::disabled
+  # Make sure we're not running mongrel
+  # Useful when migrating from mongrel to passenger
+  $disable_mongrel = hiera('puppet::master::passenger::disable_mongrel', false)
+  if $disable_mongrel == true {
+    include puppet::master::mongrel::disabled
+  }
 
   # then include puppet class
   include puppet::daemon