diff --git a/manifests/api/authtoken.pp b/manifests/api/authtoken.pp index 20ca049d..22748ac5 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 ironic::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 ironic::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/inspector/authtoken.pp b/manifests/inspector/authtoken.pp index d1284dcf..2d78a2d4 100644 --- a/manifests/inspector/authtoken.pp +++ b/manifests/inspector/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 ironic::inspector::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 ironic::inspector::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-b317cf6b989ae388.yaml b/releasenotes/notes/authtoken_manage_memcache_package-b317cf6b989ae388.yaml new file mode 100644 index 00000000..09c6d5a7 --- /dev/null +++ b/releasenotes/notes/authtoken_manage_memcache_package-b317cf6b989ae388.yaml @@ -0,0 +1,3 @@ +--- +features: + - Passes parameter to keystone authtoken define to manage python-memcache package install. diff --git a/spec/classes/ironic_api_authtoken_spec.rb b/spec/classes/ironic_api_authtoken_spec.rb index 686f6f25..77fc6310 100644 --- a/spec/classes/ironic_api_authtoken_spec.rb +++ b/spec/classes/ironic_api_authtoken_spec.rb @@ -82,6 +82,7 @@ describe 'ironic::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,10 @@ describe 'ironic::api::authtoken' do is_expected.to contain_ironic_config('keystone_authtoken/revocation_cache_time').with_value(params[:revocation_cache_time]) is_expected.to contain_ironic_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/ironic_inspector_authtoken_spec.rb b/spec/classes/ironic_inspector_authtoken_spec.rb index ad7dd950..12f2b338 100644 --- a/spec/classes/ironic_inspector_authtoken_spec.rb +++ b/spec/classes/ironic_inspector_authtoken_spec.rb @@ -82,6 +82,7 @@ describe 'ironic::inspector::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 'ironic::inspector::authtoken' do is_expected.to contain_ironic_inspector_config('keystone_authtoken/revocation_cache_time').with_value(params[:revocation_cache_time]) is_expected.to contain_ironic_inspector_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