diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp index 9e62b4582..7adfe80f1 100644 --- a/manifests/wsgi/apache.pp +++ b/manifests/wsgi/apache.pp @@ -51,7 +51,7 @@ # # [*workers*] # Number of WSGI workers to spawn. -# Optional. Defaults to 1 +# Optional. Defaults to $::os_workers # # [*ssl_cert*] # (optional) Path to SSL certificate @@ -95,7 +95,7 @@ # # [*threads*] # (optional) The number of threads for the vhost. -# Defaults to $::os_workers +# Defaults to 1 # # [*wsgi_application_group*] # (optional) The application group of the WSGI script. @@ -218,7 +218,7 @@ class keystone::wsgi::apache ( $public_path = '/', $admin_path = '/', $ssl = true, - $workers = 1, + $workers = $::os_workers, $ssl_cert = undef, $ssl_key = undef, $ssl_cert_admin = undef, @@ -228,7 +228,7 @@ class keystone::wsgi::apache ( $ssl_crl_path = undef, $ssl_crl = undef, $ssl_certs_dir = undef, - $threads = $::os_workers, + $threads = 1, $priority = '10', $wsgi_application_group = '%{GLOBAL}', $wsgi_pass_authorization = 'On', diff --git a/spec/classes/keystone_wsgi_apache_spec.rb b/spec/classes/keystone_wsgi_apache_spec.rb index de33645a0..debb3782a 100644 --- a/spec/classes/keystone_wsgi_apache_spec.rb +++ b/spec/classes/keystone_wsgi_apache_spec.rb @@ -64,8 +64,8 @@ describe 'keystone::wsgi::apache' do 'wsgi_daemon_process_options' => { 'user' => 'keystone', 'group' => 'keystone', - 'processes' => '1', - 'threads' => '42', + 'processes' => '42', + 'threads' => '1', 'display-name' => 'keystone-admin', }, 'wsgi_process_group' => 'keystone_admin', @@ -95,8 +95,8 @@ describe 'keystone::wsgi::apache' do 'wsgi_daemon_process_options' => { 'user' => 'keystone', 'group' => 'keystone', - 'processes' => '1', - 'threads' => '42', + 'processes' => '42', + 'threads' => '1', 'display-name' => 'keystone-main', }, 'wsgi_process_group' => 'keystone_main', @@ -143,7 +143,7 @@ describe 'keystone::wsgi::apache' do 'user' => 'keystone', 'group' => 'keystone', 'processes' => '37', - 'threads' => '42', + 'threads' => '1', 'display-name' => 'keystone-admin', }, 'wsgi_process_group' => 'keystone_admin', @@ -167,7 +167,7 @@ describe 'keystone::wsgi::apache' do 'user' => 'keystone', 'group' => 'keystone', 'processes' => '37', - 'threads' => '42', + 'threads' => '1', 'display-name' => 'keystone-main', }, 'wsgi_process_group' => 'keystone_main', @@ -284,7 +284,7 @@ describe 'keystone::wsgi::apache' do 'user' => 'keystone', 'group' => 'keystone', 'processes' => '37', - 'threads' => '42', + 'threads' => '1', 'display-name' => 'keystone-main', }, 'wsgi_process_group' => 'keystone_main',