openstack/puppet-keystone
Code Issues Proposed changes

Merge "Add additional memcache configuration options"

Browse Source
This commit is contained in:
Jenkins 2015-09-21 10:58:14 +00:00 committed by Gerrit Code Review
commit 40a1d04410
2 changed files with 75 additions and 16 deletions
manifests
init.pp
spec/classes
keystone_spec.rb

62
manifests/init.pp

@ -394,6 +394,25 @@
# explicitly set in the request.
# Defaults to undef (will use built-in Keystone default)
#
# [*memcache_dead_retry*]
# (optional) Number of seconds memcached server is considered dead before it
# is tried again. This is used for the cache memcache_dead_retry and the
# memcache dead_retry values.
# Defaults to undef
#
# [*memcache_socket_timeout*]
# (optional) Timeout in seconds for every call to a server.
# Defaults to undef
#
# [*memcache_pool_maxsize*]
# (optional) Max total number of open connections to every memcached server.
# Defaults to undef
#
# [*memcache_pool_unused_timeout*]
# (optional) Number of seconds a connection to memcached is held unused in
# the pool before it is closed.
# Defaults to undef.
#
# == Dependencies
# None
#
@ -500,6 +519,10 @@ class keystone(
$fernet_key_repository = '/etc/keystone/fernet-keys',
$fernet_max_active_keys = undef,
$default_domain = undef,
$memcache_dead_retry = undef,
$memcache_socket_timeout = undef,
$memcache_pool_maxsize = undef,
$memcache_pool_unused_timeout = undef,
# DEPRECATED PARAMETERS
$admin_workers = max($::processorcount, 2),
$public_workers = max($::processorcount, 2),
@ -683,11 +706,19 @@ class keystone(
validate_array($memcache_servers)
Service<| title == 'memcached' |> -> Service['keystone']
keystone_config {
'cache/enabled': value => true;
'cache/backend': value => $cache_backend;
'cache/debug_cache_backend': value => $debug_cache_backend;
'token/caching': value => $token_caching;
'memcache/servers': value => join($memcache_servers, ',');
'cache/enabled': value => true;
'cache/backend': value => $cache_backend;
'cache/debug_cache_backend': value => $debug_cache_backend;
'token/caching': value => $token_caching;
'memcache/servers': value => join($memcache_servers, ',');
'memcache/dead_retry': value => $memcache_dead_retry;
'memcache/socket_timeout': value => $memcache_socket_timeout;
'memcache/pool_maxsize': value => $memcache_pool_maxsize;
'memcache/pool_unused_timeout': value => $memcache_pool_unused_timeout;
'cache/memcache_dead_retry': value => $memcache_dead_retry;
'cache/memcache_socket_timeout': value => $memcache_socket_timeout;
'cache/memcache_pool_maxsize': value => $memcache_pool_maxsize;
'cache/memcache_pool_unused_timeout': value => $memcache_pool_unused_timeout;
}
if $cache_backend_argument {
validate_array($cache_backend_argument)
@ -701,12 +732,21 @@ class keystone(
}
} else {
keystone_config {
'cache/enabled': ensure => absent;
'cache/backend': ensure => absent;
'cache/backend_argument': ensure => absent;
'cache/debug_cache_backend': ensure => absent;
'token/caching': ensure => absent;
'memcache/servers': ensure => absent;
'cache/enabled': ensure => absent;
'cache/backend': ensure => absent;
'cache/backend_argument': ensure => absent;
'cache/debug_cache_backend': ensure => absent;
'token/caching': ensure => absent;
'memcache/servers': ensure => absent;
'memcache/dead_retry': ensure => absent;
'memcache/socket_timeout': ensure => absent;
'memcache/pool_maxsize': ensure => absent;
'memcache/pool_unused_timeout': ensure => absent;
'cache/memcache_dead_retry': ensure => absent;
'cache/memcache_socket_timeout': ensure => absent;
'cache/memcache_pool_maxsize': ensure => absent;
'cache/memcache_pool_unused_timeout': ensure => absent;
}
}

29
spec/classes/keystone_spec.rb

@ -492,11 +492,15 @@ describe 'keystone' do
describe 'configure memcache servers if set' do
let :params do
{
'admin_token' => 'service_token',
'memcache_servers' => [ 'SERVER1:11211', 'SERVER2:11211' ],
'token_driver' => 'keystone.token.backends.memcache.Token',
'cache_backend' => 'dogpile.cache.memcached',
'cache_backend_argument' => ['url:SERVER1:12211'],
'admin_token' => 'service_token',
'memcache_servers' => [ 'SERVER1:11211', 'SERVER2:11211' ],
'token_driver' => 'keystone.token.backends.memcache.Token',
'cache_backend' => 'dogpile.cache.memcached',
'cache_backend_argument' => ['url:SERVER1:12211'],
'memcache_dead_retry' => '60',
'memcache_socket_timeout' => '2',
'memcache_pool_maxsize' => '1000',
'memcache_pool_unused_timeout' => '60',
}
end
@ -505,6 +509,14 @@ describe 'keystone' do
it { is_expected.to contain_keystone_config('token/caching').with_value(true) }
it { is_expected.to contain_keystone_config('cache/backend').with_value('dogpile.cache.memcached') }
it { is_expected.to contain_keystone_config('cache/backend_argument').with_value('url:SERVER1:12211') }
it { is_expected.to contain_keystone_config('memcache/dead_retry').with_value('60') }
it { is_expected.to contain_keystone_config('memcache/socket_timeout').with_value('2') }
it { is_expected.to contain_keystone_config('memcache/pool_maxsize').with_value('1000') }
it { is_expected.to contain_keystone_config('memcache/pool_unused_timeout').with_value('60') }
it { is_expected.to contain_keystone_config('cache/memcache_dead_retry').with_value('60') }
it { is_expected.to contain_keystone_config('cache/memcache_socket_timeout').with_value('2') }
it { is_expected.to contain_keystone_config('cache/memcache_pool_maxsize').with_value('1000') }
it { is_expected.to contain_keystone_config('cache/memcache_pool_unused_timeout').with_value('60') }
it { is_expected.to contain_package('python-memcache').with(
:name => 'python-memcache',
:ensure => 'present'
@ -522,6 +534,13 @@ describe 'keystone' do
it { is_expected.to contain_keystone_config("cache/backend_argument").with_ensure('absent') }
it { is_expected.to contain_keystone_config("cache/debug_cache_backend").with_ensure('absent') }
it { is_expected.to contain_keystone_config("memcache/servers").with_ensure('absent') }
it { is_expected.to contain_keystone_config('memcache/dead_retry').with_ensure('absent') }
it { is_expected.to contain_keystone_config('memcache/pool_maxsize').with_ensure('absent') }
it { is_expected.to contain_keystone_config('memcache/pool_unused_timeout').with_ensure('absent') }
it { is_expected.to contain_keystone_config('cache/memcache_dead_retry').with_ensure('absent') }
it { is_expected.to contain_keystone_config('cache/memcache_socket_timeout').with_ensure('absent') }
it { is_expected.to contain_keystone_config('cache/memcache_pool_maxsize').with_ensure('absent') }
it { is_expected.to contain_keystone_config('cache/memcache_pool_unused_timeout').with_ensure('absent') }
end
describe 'raise error if memcache_servers is not an array' do