Use workers instead of threads in wsgi by default

In most of puppet-openstack modules, we use workers instead of threads
in wsgi to realize concurrency of api process by default.

This patch makes puppet-cloudkitty follow that standard configuration,
so that the default setup can be more consistent among all modules.

Change-Id: I287b36155958cd535b18d60f0c80395c3082ee46
This commit is contained in:
Takashi Kajinami
2020-07-05 00:02:52 +09:00
parent 773b472687
commit 306badcca1
3 changed files with 12 additions and 7 deletions

View File

@@ -42,7 +42,7 @@
#
# [*workers*]
# Number of WSGI workers to spawn.
# Optional. Defaults to 1
# Optional. Defaults to $::os_workers
#
# [*priority*]
# (optional) The priority for the vhost.
@@ -50,7 +50,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.
@@ -102,7 +102,7 @@ class cloudkitty::wsgi::apache (
$bind_host = undef,
$path = '/',
$ssl = true,
$workers = 1,
$workers = $::os_workers,
$ssl_cert = undef,
$ssl_key = undef,
$ssl_chain = undef,
@@ -111,7 +111,7 @@ class cloudkitty::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,

View File

@@ -0,0 +1,5 @@
---
fixes:
- |
In wsgi configuration, now workers is used to define concurrency by default
instead of threads, to be consistent with the other puppet modules.

View File

@@ -14,9 +14,9 @@ describe 'cloudkitty::wsgi::apache' do
:path => '/',
:servername => facts[:fqdn],
:ssl => true,
:threads => facts[:os_workers],
:threads => 1,
:user => 'cloudkitty',
:workers => 1,
:workers => facts[:os_workers],
:wsgi_daemon_process => 'cloudkitty',
:wsgi_process_group => 'cloudkitty',
:wsgi_script_dir => platform_params[:wsgi_script_path],
@@ -56,7 +56,7 @@ describe 'cloudkitty::wsgi::apache' do
:path => '/',
:servername => 'dummy.host',
:ssl => false,
:threads => facts[:os_workers],
:threads => 1,
:user => 'cloudkitty',
:workers => 37,
:wsgi_daemon_process => 'cloudkitty',