diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-07-19 15:31:28 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-07-19 15:31:28 +0000 |
| commit | 970fcfcb58b2d0d26a39c2d9deab3a0301eb65ca (patch) | |
| tree | b08d7f8ae83cbfb93603647ad812117209e22591 /puppet/services | |
| parent | 9da188033aa92c00e2c363fba29f25c4e5c73e09 (diff) | |
| parent | dd41e052eaf4e86f20461fd6529b4c4899b8544f (diff) | |
Merge "Repurpose KeystoneWorkers add keystone::wsgi::apache::threads"
Diffstat (limited to 'puppet/services')
| -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 |