Repurpose KeystoneWorkers add keystone::wsgi::apache::threads
Now that keystone is run with wsgi apache the KeystoneWorkers
param has no efffect [1]. This repurposes KeystoneWorkers to now
set wsgi::apache::workers and adds the
keystone::wsgi::apache::threads hardcoding to 1 (can overrride
via extraconfig data)
[1] 51c68fb127/manifests/init.pp (L396)
Closes-Bug: 1598092
Change-Id: I503d1f0d3f4c56abfaf4609ea8290e78668013b6
This commit is contained in:
parent
c89f2e3f01
commit
dd41e052ea
|
@ -45,10 +45,6 @@ parameters:
|
|||
type: string
|
||||
default: 'regionOne'
|
||||
description: Keystone region for endpoint
|
||||
KeystoneWorkers:
|
||||
default: 0
|
||||
description: Number of workers for Keystone service.
|
||||
type: number
|
||||
EndpointMap:
|
||||
default: {}
|
||||
description: Mapping of service endpoint -> protocol. Typically set
|
||||
|
@ -88,7 +84,10 @@ parameters:
|
|||
default: 5672
|
||||
description: Set rabbit subscriber port, change this if using SSL
|
||||
type: number
|
||||
|
||||
KeystoneWorkers:
|
||||
type: string
|
||||
description: Set the number of workers for keystone::wsgi::apache
|
||||
default: '$::processorcount'
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the Keystone role.
|
||||
|
@ -124,8 +123,6 @@ outputs:
|
|||
keystone::endpoint::internal_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
|
||||
keystone::endpoint::admin_url: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]}
|
||||
keystone::endpoint::region: {get_param: KeystoneRegion}
|
||||
keystone::admin_workers: {get_param: KeystoneWorkers}
|
||||
keystone::public_workers: {get_param: KeystoneWorkers}
|
||||
keystone_enable_db_purge: {get_param: KeystoneEnableDBPurge}
|
||||
keystone::public_endpoint: {get_param: [EndpointMap, KeystonePublic, uri_no_suffix]}
|
||||
keystone::db::mysql::user: keystone
|
||||
|
@ -135,5 +132,8 @@ outputs:
|
|||
- '%'
|
||||
- "%{hiera('mysql_bind_host')}"
|
||||
|
||||
keystone::wsgi::apache::workers: {get_param: KeystoneWorkers}
|
||||
# override via extraconfig:
|
||||
keystone::wsgi::apache::threads: 1
|
||||
step_config: |
|
||||
include ::tripleo::profile::base::keystone
|
||||
|
|
Loading…
Reference in New Issue