diff options
| author |   marios <marios@redhat.com> | 2016-07-01 13:01:08 +0300 |
|---|---|---|
| committer | marios <marios@redhat.com> | 2016-07-11 16:31:30 +0300 |
| commit | dd41e052eaf4e86f20461fd6529b4c4899b8544f (patch) | |
| tree | 15a8c8659e5c4c8ad65b059566bb688fd83f8766 | |
| parent | c89f2e3f01e81e50d48e81a5d5727e62f1ffc178 (diff) | |
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] https://github.com/openstack/puppet-keystone/blob/51c68fb127c28b9748b352871783c3ec6ef5c83b/manifests/init.pp#L396
Closes-Bug: 1598092
Change-Id: I503d1f0d3f4c56abfaf4609ea8290e78668013b6
| -rw-r--r-- | puppet/services/keystone.yaml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/puppet/services/keystone.yaml b/puppet/services/keystone.yaml index 0ad6025c..e98be118 100644 --- a/puppet/services/keystone.yaml +++ b/puppet/services/keystone.yaml @@ -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 |