openstack
/
fuel-library
Code Issues Proposed changes

Merge "Fixed issue with keystone memcache" into stable/6.1

This commit is contained in:
Jenkins 2015-06-11 12:57:07 +00:00 committed by Gerrit Code Review
parent 2a91007bfb bf1382cfac
commit 3d1afb3bb2
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -256,6 +256,7 @@ class openstack::keystone (
'cache/memcache_socket_timeout': value => '1';
'cache/memcache_pool_maxsize': value => '1000';
'cache/memcache_pool_unused_timeout': value => '60';
'memcache/dead_retry': value => '30';
'revoke/driver': value => 'keystone.contrib.revoke.backends.sql.Revoke';
}
}

1
tests/noop/spec/hosts/keystone/keystone_spec.rb
View File

@ -31,6 +31,7 @@ describe manifest do
should contain_keystone_config('cache/memcache_socket_timeout').with(:value => '1')
should contain_keystone_config('cache/memcache_pool_maxsize').with(:value => '1000')
should contain_keystone_config('cache/memcache_pool_unused_timeout').with(:value => '60')
should contain_keystone_config('memcache/dead_retry').with(:value => '30')
end
# it 'should declare keystone::wsgi::apache class with 4 workers on 4 CPU system' do