openstack
/
fuel-library
Code Issues Proposed changes

Merge "Set upper limit on keystone workers" into stable/8.0

This commit is contained in:
Jenkins 2016-09-28 14:47:42 +00:00 committed by Gerrit Code Review
parent 61df04cd7d 05c26f6962
commit d64fa0f1cb
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deployment/puppet/nailgun/examples/keystone-only.pp
View File

@ -18,12 +18,16 @@ case $production {
class {'docker::container': }
$service_workers = min(max($::processorcount, 2), 16)
class { 'keystone':
admin_token => $::fuel_settings['keystone']['admin_token'],
catalog_type => 'sql',
database_connection => "postgresql://${::fuel_settings['postgres']['keystone_user']}:${::fuel_settings['postgres']['keystone_password']}@${::fuel_settings['ADMIN_NETWORK']['ipaddress']}/${::fuel_settings['postgres']['keystone_dbname']}",
token_expiration => pick($::fuel_settings['keystone']['token_expiration'], 21600),
token_provider => 'keystone.token.providers.uuid.Provider',
admin_workers => $service_workers,
public_workers => $service_workers,
}
#FIXME(mattymo): We should enable db_sync on every run inside keystone,

2
deployment/puppet/openstack/manifests/keystone.pp
View File

@ -81,7 +81,7 @@ class openstack::keystone (
$token_provider = undef,
$revoke_driver = false,
$ceilometer = false,
$service_workers = $::processorcount,
$service_workers = min(max($::processorcount, 2), 16),
$fernet_src_repository = undef,
$fernet_key_repository = '/etc/keystone/fernet-keys',
) {