From 5c1632c100e89437d17ddae40ee9723fcb9e6c67 Mon Sep 17 00:00:00 2001 From: Alessandro Italiano Date: Wed, 14 Oct 2020 16:06:29 +0200 Subject: [PATCH] Unset memcached_servers by default This change make sure that OIDCMemCacheServers is not set when the memcached_servers is not set, to avoid setting empty value. Change-Id: Id9dfbab25b7a064e5fee6d8bf4fe6a171fba9b15 --- manifests/federation/openidc.pp | 6 +++++- templates/openidc.conf.erb | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/manifests/federation/openidc.pp b/manifests/federation/openidc.pp index 0c1d35347..c248f4156 100644 --- a/manifests/federation/openidc.pp +++ b/manifests/federation/openidc.pp @@ -163,7 +163,11 @@ class keystone::federation::openidc ( } } - $memcached_servers_real = join(any2array($memcached_servers), ' ') + if $memcached_servers != undef { + $memcached_servers_real = join(any2array($memcached_servers), ' ') + } else { + $memcached_servers_real = undef + } # Note: if puppet-apache modify these values, this needs to be updated if $template_order <= 330 or $template_order >= 999 { diff --git a/templates/openidc.conf.erb b/templates/openidc.conf.erb index 63a348449..687baf4b3 100644 --- a/templates/openidc.conf.erb +++ b/templates/openidc.conf.erb @@ -22,7 +22,7 @@ <%- if scope['::keystone::federation::openidc::openidc_cache_clean_interval'] != nil -%> OIDCCacheFileCleanInterval scope['::keystone::federation::openidc::openidc_cache_clean_interval'] %> <%- end -%> -<%- if scope['::keystone::federation::openidc::memcached_servers_real'] -%> +<%- if scope['::keystone::federation::openidc::memcached_servers_real'] != nil -%> OIDCMemCacheServers "<%= scope['::keystone::federation::openidc::memcached_servers_real'] %>" <%- end -%> <%- if scope['::keystone::federation::openidc::redis_server'] != nil -%>