diff --git a/manifests/api/authtoken.pp b/manifests/api/authtoken.pp index d33a9335..37f1d523 100644 --- a/manifests/api/authtoken.pp +++ b/manifests/api/authtoken.pp @@ -164,6 +164,10 @@ # caching. If left undefined, tokens will instead be cached in-process. # Defaults to $::os_service_default. # +# [*manage_memcache_package*] +# (Optional) Whether to install the python-memcache package. +# Defaults to false. +# # [*region_name*] # (Optional) The region in which the identity server can be found. # Defaults to $::os_service_default. @@ -219,6 +223,7 @@ class glance::api::authtoken( $memcache_security_strategy = $::os_service_default, $memcache_use_advanced_pool = $::os_service_default, $memcached_servers = $::os_service_default, + $manage_memcache_package = false, $region_name = $::os_service_default, $revocation_cache_time = $::os_service_default, $token_cache_time = $::os_service_default, @@ -268,6 +273,7 @@ class glance::api::authtoken( memcache_use_advanced_pool => $memcache_use_advanced_pool, memcache_pool_unused_timeout => $memcache_pool_unused_timeout, memcached_servers => $memcached_servers, + manage_memcache_package => $manage_memcache_package, region_name => $region_name, revocation_cache_time => $revocation_cache_time, token_cache_time => $token_cache_time, diff --git a/manifests/glare/authtoken.pp b/manifests/glare/authtoken.pp index a9532ccc..0dd506e3 100644 --- a/manifests/glare/authtoken.pp +++ b/manifests/glare/authtoken.pp @@ -164,6 +164,10 @@ # caching. If left undefined, tokens will instead be cached in-process. # Defaults to $::os_service_default. # +# [*manage_memcache_package*] +# (Optional) Whether to install the python-memcache package. +# Defaults to false. +# # [*region_name*] # (Optional) The region in which the identity server can be found. # Defaults to $::os_service_default. @@ -219,6 +223,7 @@ class glance::glare::authtoken( $memcache_security_strategy = $::os_service_default, $memcache_use_advanced_pool = $::os_service_default, $memcached_servers = $::os_service_default, + $manage_memcache_package = false, $region_name = $::os_service_default, $revocation_cache_time = $::os_service_default, $token_cache_time = $::os_service_default, @@ -266,6 +271,7 @@ class glance::glare::authtoken( memcache_use_advanced_pool => $memcache_use_advanced_pool, memcache_pool_unused_timeout => $memcache_pool_unused_timeout, memcached_servers => $memcached_servers, + manage_memcache_package => $manage_memcache_package, region_name => $region_name, revocation_cache_time => $revocation_cache_time, token_cache_time => $token_cache_time, diff --git a/manifests/registry/authtoken.pp b/manifests/registry/authtoken.pp index 382a9c4e..58138c63 100644 --- a/manifests/registry/authtoken.pp +++ b/manifests/registry/authtoken.pp @@ -164,6 +164,10 @@ # caching. If left undefined, tokens will instead be cached in-process. # Defaults to $::os_service_default. # +# [*manage_memcache_package*] +# (Optional) Whether to install the python-memcache package. +# Defaults to false. +# # [*region_name*] # (Optional) The region in which the identity server can be found. # Defaults to $::os_service_default. @@ -219,6 +223,7 @@ class glance::registry::authtoken( $memcache_security_strategy = $::os_service_default, $memcache_use_advanced_pool = $::os_service_default, $memcached_servers = $::os_service_default, + $manage_memcache_package = false, $region_name = $::os_service_default, $revocation_cache_time = $::os_service_default, $token_cache_time = $::os_service_default, @@ -268,6 +273,7 @@ class glance::registry::authtoken( memcache_use_advanced_pool => $memcache_use_advanced_pool, memcache_pool_unused_timeout => $memcache_pool_unused_timeout, memcached_servers => $memcached_servers, + manage_memcache_package => $manage_memcache_package, region_name => $region_name, revocation_cache_time => $revocation_cache_time, token_cache_time => $token_cache_time, diff --git a/releasenotes/notes/authtoken_manage_memcache_package-2d02bf561959f26e.yaml b/releasenotes/notes/authtoken_manage_memcache_package-2d02bf561959f26e.yaml new file mode 100644 index 00000000..09c6d5a7 --- /dev/null +++ b/releasenotes/notes/authtoken_manage_memcache_package-2d02bf561959f26e.yaml @@ -0,0 +1,3 @@ +--- +features: + - Passes parameter to keystone authtoken define to manage python-memcache package install. diff --git a/spec/classes/glance_api_authtoken_spec.rb b/spec/classes/glance_api_authtoken_spec.rb index 7b97e94a..f6e4e0a4 100644 --- a/spec/classes/glance_api_authtoken_spec.rb +++ b/spec/classes/glance_api_authtoken_spec.rb @@ -82,6 +82,7 @@ describe 'glance::api::authtoken' do :memcache_security_strategy => 'ENCRYPT', :memcache_use_advanced_pool => true, :memcached_servers => ['memcached01:11211','memcached02:11211'], + :manage_memcache_package => true, :region_name => 'region2', :revocation_cache_time => '11', :token_cache_time => '301', @@ -124,6 +125,11 @@ describe 'glance::api::authtoken' do is_expected.to contain_glance_api_config('keystone_authtoken/revocation_cache_time').with_value(params[:revocation_cache_time]) is_expected.to contain_glance_api_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time]) end + + it 'installs python memcache package' do + is_expected.to contain_package('python-memcache') + end + end end diff --git a/spec/classes/glance_glare_authtoken_spec.rb b/spec/classes/glance_glare_authtoken_spec.rb index 53c8e68c..8cb3195b 100644 --- a/spec/classes/glance_glare_authtoken_spec.rb +++ b/spec/classes/glance_glare_authtoken_spec.rb @@ -82,6 +82,7 @@ describe 'glance::glare::authtoken' do :memcache_security_strategy => 'ENCRYPT', :memcache_use_advanced_pool => true, :memcached_servers => ['memcached01:11211','memcached02:11211'], + :manage_memcache_package => true, :region_name => 'region2', :revocation_cache_time => '11', :token_cache_time => '301', @@ -124,6 +125,10 @@ describe 'glance::glare::authtoken' do is_expected.to contain_glance_glare_config('keystone_authtoken/revocation_cache_time').with_value(params[:revocation_cache_time]) is_expected.to contain_glance_glare_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time]) end + + it 'installs python memcache package' do + is_expected.to contain_package('python-memcache') + end end end diff --git a/spec/classes/glance_registry_authtoken_spec.rb b/spec/classes/glance_registry_authtoken_spec.rb index e8b3bf7f..9687f804 100644 --- a/spec/classes/glance_registry_authtoken_spec.rb +++ b/spec/classes/glance_registry_authtoken_spec.rb @@ -82,6 +82,7 @@ describe 'glance::registry::authtoken' do :memcache_security_strategy => 'ENCRYPT', :memcache_use_advanced_pool => true, :memcached_servers => ['memcached01:11211','memcached02:11211'], + :manage_memcache_package => true, :region_name => 'region2', :revocation_cache_time => '11', :token_cache_time => '301', @@ -124,6 +125,10 @@ describe 'glance::registry::authtoken' do is_expected.to contain_glance_registry_config('keystone_authtoken/revocation_cache_time').with_value(params[:revocation_cache_time]) is_expected.to contain_glance_registry_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time]) end + + it 'installs python memcache package' do + is_expected.to contain_package('python-memcache') + end end end