openstack
/
puppet-keystone
Code Issues Proposed changes

cache: Migrate parsing of memcache_server to puppet-oslo 

... to avoid duplicate handling.

Depends-on: https://review.opendev.org/805588
Change-Id: Iaba4926adde192383e174fe8890a69ece089663e
This commit is contained in:
Takashi Kajinami 2021-08-23 16:45:05 +09:00
parent 068564b6c7
commit a087173cbe
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/cache.pp
View File

@ -147,11 +147,6 @@ class keystone::cache(
include keystone::deps
$memcache_servers_array = $memcache_servers ? {
String => split($memcache_servers, ','),
default => $memcache_servers
}
if !is_service_default($memcache_servers) {
Service<| title == 'memcached' |> -> Anchor['keystone::service::begin']
}
@ -172,7 +167,7 @@ class keystone::cache(
proxies => $proxies,
enabled => $enabled,
debug_cache_backend => $debug_cache_backend,
memcache_servers => $memcache_servers_array,
memcache_servers => $memcache_servers,
memcache_dead_retry => $memcache_dead_retry,
memcache_socket_timeout => $memcache_socket_timeout,
memcache_pool_maxsize => $memcache_pool_maxsize,

2
spec/classes/keystone_cache_spec.rb
View File

@ -24,7 +24,7 @@ describe 'keystone::cache' do
:proxies => '<SERVICE DEFAULT>',
:enabled => '<SERVICE DEFAULT>',
:debug_cache_backend => '<SERVICE DEFAULT>',
:memcache_servers => ['<SERVICE DEFAULT>'],
:memcache_servers => '<SERVICE DEFAULT>',
:memcache_dead_retry => '<SERVICE DEFAULT>',
:memcache_socket_timeout => '<SERVICE DEFAULT>',
:memcache_pool_maxsize => '<SERVICE DEFAULT>',