From f882e39447506eb500e3211df786c7d21b84d792 Mon Sep 17 00:00:00 2001 From: Tobias Urdin Date: Thu, 20 Sep 2018 11:15:32 +0200 Subject: [PATCH] Add manage_backend_package parameter Adds the manage_backend_package parameter that is sent to the oslo::cache class that determines if we should install the backend python library for caching. The default value is not changed and defaults to true same as the oslo::cache class does. Change-Id: I8a99eee7622e25847c2d729fa97d0500fe27d8f4 --- manifests/init.pp | 6 +++ ...manage-backend-param-490db3b5bce0b3ea.yaml | 7 +++ spec/classes/keystone_init_spec.rb | 54 ++++++++++--------- 3 files changed, 42 insertions(+), 25 deletions(-) create mode 100644 releasenotes/notes/manage-backend-param-490db3b5bce0b3ea.yaml diff --git a/manifests/init.pp b/manifests/init.pp index 835f99339..5443fabb9 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -532,6 +532,10 @@ # client connection. (integer value) # Defaults to $::os_service_default # +# [*manage_backend_package*] +# (Optional) (Optional) Whether to install the backend package for the cache. +# Defaults to true +# # [*policy_driver*] # Policy backend driver. (string value) # Defaults to $::os_service_default. @@ -736,6 +740,7 @@ class keystone( $memcache_pool_maxsize = $::os_service_default, $memcache_pool_unused_timeout = $::os_service_default, $memcache_pool_connection_get_timeout = $::os_service_default, + $manage_backend_package = true, $policy_driver = $::os_service_default, $using_domain_config = false, $domain_config_directory = '/etc/keystone/domains', @@ -922,6 +927,7 @@ We have enabled caching as a backwards compatibility that will be removed in the memcache_pool_maxsize => $memcache_pool_maxsize, memcache_pool_unused_timeout => $memcache_pool_unused_timeout, memcache_pool_connection_get_timeout => $memcache_pool_connection_get_timeout, + manage_backend_package => $manage_backend_package, } oslo::middleware { 'keystone_config': diff --git a/releasenotes/notes/manage-backend-param-490db3b5bce0b3ea.yaml b/releasenotes/notes/manage-backend-param-490db3b5bce0b3ea.yaml new file mode 100644 index 000000000..78e5182f5 --- /dev/null +++ b/releasenotes/notes/manage-backend-param-490db3b5bce0b3ea.yaml @@ -0,0 +1,7 @@ +--- +features: + - | + Added new parameter keystone::manage_backend_package that is sent to the + oslo::cache class which determines if the backend cache python library + should be installed or not. Defaults to true same as oslo::cache default + value. diff --git a/spec/classes/keystone_init_spec.rb b/spec/classes/keystone_init_spec.rb index c95450a63..ac72cf513 100644 --- a/spec/classes/keystone_init_spec.rb +++ b/spec/classes/keystone_init_spec.rb @@ -604,16 +604,18 @@ describe 'keystone' do describe 'configure cache memcache servers if set' do let :params do { - 'admin_token' => 'service_token', - 'memcache_servers' => [ 'SERVER1:11211', 'SERVER2:11211' ], - 'token_driver' => 'memcache', - 'cache_backend' => 'dogpile.cache.memcached', - 'cache_backend_argument' => ['url:SERVER3:12211'], - 'cache_memcache_servers' => [ 'SERVER3:11211', 'SERVER4:11211' ], - 'memcache_dead_retry' => '60', - 'memcache_socket_timeout' => '2', - 'memcache_pool_maxsize' => '1000', - 'memcache_pool_unused_timeout' => '60', + 'admin_token' => 'service_token', + 'memcache_servers' => [ 'SERVER1:11211', 'SERVER2:11211' ], + 'token_driver' => 'noop', + 'cache_backend' => 'dogpile.cache.memcached', + 'cache_backend_argument' => ['url:SERVER3:12211'], + 'cache_memcache_servers' => [ 'SERVER3:11211', 'SERVER4:11211' ], + 'memcache_dead_retry' => '60', + 'memcache_socket_timeout' => '2', + 'memcache_pool_maxsize' => '1000', + 'memcache_pool_unused_timeout' => '60', + 'memcache_pool_connection_get_timeout' => '30', + 'manage_backend_package' => false, } end @@ -630,27 +632,27 @@ describe 'keystone' do 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_keystone_config('cache/memcache_pool_connection_get_timeout').with_value('30') } it { is_expected.to contain_keystone_config('cache/memcache_servers').with_value('SERVER3:11211,SERVER4:11211') } - it { is_expected.to contain_package('python-memcache').with( - :name => 'python-memcache', - :ensure => 'present' - ) } + it { is_expected.to contain_oslo__cache('keystone_config').with_manage_backend_package(false) } + it { is_expected.not_to contain_package('python-memcache') } end describe 'configure cache enabled if set' do let :params do { - 'admin_token' => 'service_token', - 'memcache_servers' => [ 'SERVER1:11211', 'SERVER2:11211' ], - 'token_driver' => 'memcache', - 'cache_backend' => 'dogpile.cache.memcached', - 'cache_backend_argument' => ['url:SERVER3:12211'], - 'cache_enabled' => false, - 'cache_memcache_servers' => [ 'SERVER3:11211', 'SERVER4:11211' ], - 'memcache_dead_retry' => '60', - 'memcache_socket_timeout' => '2', - 'memcache_pool_maxsize' => '1000', - 'memcache_pool_unused_timeout' => '60', + 'admin_token' => 'service_token', + 'memcache_servers' => [ 'SERVER1:11211', 'SERVER2:11211' ], + 'token_driver' => 'memcache', + 'cache_backend' => 'dogpile.cache.memcached', + 'cache_backend_argument' => ['url:SERVER3:12211'], + 'cache_enabled' => false, + 'cache_memcache_servers' => [ 'SERVER3:11211', 'SERVER4:11211' ], + 'memcache_dead_retry' => '60', + 'memcache_socket_timeout' => '2', + 'memcache_pool_maxsize' => '1000', + 'memcache_pool_unused_timeout' => '60', + 'memcache_pool_connection_get_timeout' => '30', } end @@ -667,6 +669,7 @@ describe 'keystone' do 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_keystone_config('cache/memcache_pool_connection_get_timeout').with_value('30') } it { is_expected.to contain_keystone_config('cache/memcache_servers').with_value('SERVER3:11211,SERVER4:11211') } it { is_expected.to contain_package('python-memcache').with( :name => 'python-memcache', @@ -704,6 +707,7 @@ describe 'keystone' do it { is_expected.to contain_keystone_config('cache/memcache_socket_timeout').with_value('') } it { is_expected.to contain_keystone_config('cache/memcache_pool_maxsize').with_value('') } it { is_expected.to contain_keystone_config('cache/memcache_pool_unused_timeout').with_value('') } + it { is_expected.to contain_keystone_config('cache/memcache_pool_connection_get_timeout').with_value('') } it { is_expected.to contain_keystone_config('cache/memcache_servers').with_value('') } end