openstack
/
puppet-keystone
Code Issues Proposed changes

Merge "Unset memcached_servers by default"

This commit is contained in:
Zuul 2020-11-24 17:20:05 +00:00 committed by Gerrit Code Review
parent 4637305569 5c1632c100
commit cd7cecdaf3
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/federation/openidc.pp
View File

@ -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 {

2
templates/openidc.conf.erb
View File

@ -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 -%>