Allow python-memcache install from authtoken class

The python-memcache package is required if using memcached. By
default the package is not installed and the define has it set to
false. This change allows managing the python-memcache package
install from the authtoken class.

Change-Id: I492f8eb4826140be3bfa041adb13b2a916a50bb8
This commit is contained in:
Matthew J. Black 2017-01-11 18:28:17 -05:00
parent bc475a0d42
commit 7013f5f9e1
3 changed files with 14 additions and 0 deletions

View File

@ -160,6 +160,10 @@
# caching. If left undefined, tokens will instead be cached in-process. # caching. If left undefined, tokens will instead be cached in-process.
# Defaults to $::os_service_default. # Defaults to $::os_service_default.
# #
# [*manage_memcache_package*]
# (Optional) Whether to install the python-memcache package.
# Defaults to false.
#
# [*region_name*] # [*region_name*]
# (Optional) The region in which the identity server can be found. # (Optional) The region in which the identity server can be found.
# Defaults to $::os_service_default. # Defaults to $::os_service_default.
@ -215,6 +219,7 @@ class magnum::keystone::authtoken(
$memcache_security_strategy = $::os_service_default, $memcache_security_strategy = $::os_service_default,
$memcache_use_advanced_pool = $::os_service_default, $memcache_use_advanced_pool = $::os_service_default,
$memcached_servers = $::os_service_default, $memcached_servers = $::os_service_default,
$manage_memcache_package = false,
$region_name = $::os_service_default, $region_name = $::os_service_default,
$revocation_cache_time = $::os_service_default, $revocation_cache_time = $::os_service_default,
$token_cache_time = $::os_service_default, $token_cache_time = $::os_service_default,
@ -260,6 +265,7 @@ class magnum::keystone::authtoken(
memcache_use_advanced_pool => $memcache_use_advanced_pool, memcache_use_advanced_pool => $memcache_use_advanced_pool,
memcache_pool_unused_timeout => $memcache_pool_unused_timeout, memcache_pool_unused_timeout => $memcache_pool_unused_timeout,
memcached_servers => $memcached_servers, memcached_servers => $memcached_servers,
manage_memcache_package => $manage_memcache_package,
region_name => $region_name, region_name => $region_name,
revocation_cache_time => $revocation_cache_time, revocation_cache_time => $revocation_cache_time,
token_cache_time => $token_cache_time, token_cache_time => $token_cache_time,

View File

@ -0,0 +1,3 @@
---
features:
- Passes parameter to keystone authtoken define to manage python-memcache package install.

View File

@ -86,6 +86,7 @@ describe 'magnum::keystone::authtoken' do
:memcache_security_strategy => 'ENCRYPT', :memcache_security_strategy => 'ENCRYPT',
:memcache_use_advanced_pool => true, :memcache_use_advanced_pool => true,
:memcached_servers => ['memcached01:11211','memcached02:11211'], :memcached_servers => ['memcached01:11211','memcached02:11211'],
:manage_memcache_package => true,
:region_name => 'region2', :region_name => 'region2',
:revocation_cache_time => '11', :revocation_cache_time => '11',
:token_cache_time => '301', :token_cache_time => '301',
@ -128,6 +129,10 @@ describe 'magnum::keystone::authtoken' do
is_expected.to contain_magnum_config('keystone_authtoken/revocation_cache_time').with_value(params[:revocation_cache_time]) is_expected.to contain_magnum_config('keystone_authtoken/revocation_cache_time').with_value(params[:revocation_cache_time])
is_expected.to contain_magnum_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time]) is_expected.to contain_magnum_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time])
end end
it 'installs python memcache package' do
is_expected.to contain_package('python-memcache')
end
end end
end end