diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp index f6818f90..24903328 100644 --- a/manifests/wsgi/apache.pp +++ b/manifests/wsgi/apache.pp @@ -46,7 +46,7 @@ # # [*workers*] # Number of WSGI workers to spawn. -# Optional. Defaults to 1 +# Optional. Defaults to $::os_workers # # [*priority*] # (optional) The priority for the vhost. @@ -54,11 +54,11 @@ # # [*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. -# Defaults to undef +# Defaults to undef # # [*ssl_cert*] # [*ssl_key*] @@ -94,7 +94,7 @@ class aodh::wsgi::apache ( $bind_host = undef, $path = '/', $ssl = true, - $workers = 1, + $workers = $::os_workers, $ssl_cert = undef, $ssl_key = undef, $ssl_chain = undef, @@ -103,7 +103,7 @@ class aodh::wsgi::apache ( $ssl_crl = undef, $ssl_certs_dir = undef, $wsgi_process_display_name = undef, - $threads = $::os_workers, + $threads = 1, $priority = '10', $custom_wsgi_process_options = {}, ) { diff --git a/spec/classes/aodh_wsgi_apache_spec.rb b/spec/classes/aodh_wsgi_apache_spec.rb index 0d4c6181..e8b6b62d 100644 --- a/spec/classes/aodh_wsgi_apache_spec.rb +++ b/spec/classes/aodh_wsgi_apache_spec.rb @@ -14,9 +14,9 @@ describe 'aodh::wsgi::apache' do :path => '/', :servername => facts[:fqdn], :ssl => true, - :threads => facts[:os_workers], + :threads => 1, :user => 'aodh', - :workers => 1, + :workers => facts[:os_workers], :wsgi_daemon_process => 'aodh', :wsgi_process_group => 'aodh', :wsgi_script_dir => platform_params[:wsgi_script_path], @@ -51,7 +51,7 @@ describe 'aodh::wsgi::apache' do :path => '/', :servername => 'dummy.host', :ssl => false, - :threads => facts[:os_workers], + :threads => 1, :user => 'aodh', :workers => 37, :wsgi_daemon_process => 'aodh',