diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp index 85554035..3b9306b8 100644 --- a/manifests/wsgi/apache.pp +++ b/manifests/wsgi/apache.pp @@ -31,7 +31,7 @@ # # [*workers*] # Number of WSGI workers to spawn. -# Optional. Defaults to 1 +# Optional. Defaults to $::os_workers # # [*ssl_cert*] # (optional) Path to SSL certificate @@ -67,7 +67,7 @@ # # [*threads*] # (optional) The number of threads for the vhost. -# Defaults to $::os_workers +# Defaults to 1 # # [*wsgi_process_display_name*] # (optional) Name of the WSGI process display-name. @@ -109,7 +109,7 @@ class barbican::wsgi::apache ( $bind_host = undef, $public_path = '/', $ssl = true, - $workers = 1, + $workers = $::os_workers, $ssl_cert = undef, $ssl_key = undef, $ssl_chain = undef, @@ -118,7 +118,7 @@ class barbican::wsgi::apache ( $ssl_crl = undef, $ssl_certs_dir = undef, $wsgi_process_display_name = undef, - $threads = $::os_workers, + $threads = 1, $priority = '10', $access_log_file = false, $access_log_format = false, diff --git a/spec/classes/barbican_wsgi_apache_spec.rb b/spec/classes/barbican_wsgi_apache_spec.rb index 2ad98070..e66e26de 100644 --- a/spec/classes/barbican_wsgi_apache_spec.rb +++ b/spec/classes/barbican_wsgi_apache_spec.rb @@ -33,9 +33,9 @@ describe 'barbican::wsgi::apache' do :path => '/', :servername => facts[:fqdn], :ssl => true, - :threads => facts[:os_workers], + :threads => 1, :user => 'barbican', - :workers => 1, + :workers => facts[:os_workers], :wsgi_daemon_process => 'barbican-api', :wsgi_process_group => 'barbican-api', :wsgi_script_dir => platform_params[:wsgi_script_path], @@ -71,7 +71,7 @@ describe 'barbican::wsgi::apache' do :path => '/', :servername => 'dummy.host', :ssl => false, - :threads => facts[:os_workers], + :threads => 1, :user => 'barbican', :workers => 37, :wsgi_daemon_process => 'barbican-api',