Merge "add parameter to overwrite/add wsgi process options"

manifests/wsgi/apache.pp

@@ -78,6 +78,14 @@
 #     The error log file name for the virtualhost.
 #     Optional. Defaults to undef.
 #
+# [*custom_wsgi_process_options*]
+#   (optional) gives you the oportunity to add custom process options or to
+#   overwrite the default options for the WSGI main process.
+#   eg. to use a virtual python environment for the WSGI process
+#   you could set it to:
+#   { python-path => '/my/python/virtualenv' }
+#   Defaults to {}
+#
 # == Dependencies
 #
 #   requires Class['apache'] & Class['zaqar']
@@ -108,6 +116,7 @@ class zaqar::wsgi::apache (
   $access_log_file             = false,
   $access_log_format           = false,
   $error_log_file              = undef,
+  $custom_wsgi_process_options = {},
 ) {
 
   include ::zaqar::deps
@@ -147,5 +156,6 @@ class zaqar::wsgi::apache (
     access_log_file             => $access_log_file,
     access_log_format           => $access_log_format,
     error_log_file              => $error_log_file,
+    custom_wsgi_process_options => $custom_wsgi_process_options,
   }
 }

releasenotes/notes/wsgi_process_options-bba8611358c14afd.yaml

@@ -0,0 +1,4 @@
+---
+features:
+  - Add parameter to apache_wsgi to allow overwrite
+    and/or add additional wsgi process options.

spec/classes/zaqar_wsgi_apache_spec.rb

@@ -24,6 +24,7 @@ describe 'zaqar::wsgi::apache' do
         :wsgi_script_source          => platform_params[:wsgi_script_source],
         :access_log_file             => false,
         :access_log_format           => false,
+        :custom_wsgi_process_options => {},
       )}
     end
 
@@ -38,7 +39,10 @@ describe 'zaqar::wsgi::apache' do
           :workers                     => 37,
           :access_log_file             => '/var/log/httpd/access_log',
           :access_log_format           => 'some format',
-          :error_log_file            => '/var/log/httpd/error_log'
+          :error_log_file              => '/var/log/httpd/error_log',
+          :custom_wsgi_process_options => {
+            'python_path' => '/my/python/path',
+          },
         }
       end
       it { is_expected.to contain_class('zaqar::params') }
@@ -63,7 +67,10 @@ describe 'zaqar::wsgi::apache' do
         :wsgi_script_source          => platform_params[:wsgi_script_source],
         :access_log_file             => '/var/log/httpd/access_log',
         :access_log_format           => 'some format',
-        :error_log_file            => '/var/log/httpd/error_log'
+        :error_log_file              => '/var/log/httpd/error_log',
+        :custom_wsgi_process_options => {
+          'python_path' => '/my/python/path',
+        },
       )}
     end
   end