From ac24e085e0e7964febe723a528417edede1bfe52 Mon Sep 17 00:00:00 2001 From: Grzegorz Grasza Date: Wed, 23 Oct 2019 11:36:29 +0900 Subject: [PATCH] [train-only] Fix Automatically set memcache_servers for keystone cache This fixes a conflict with 8d5bb4b8948ecdef0a0659e4b6bb10756b7cc1bc preserving the ability to specify the memcached port The backport which introduced the issue: e8f473f5bc1559cadff61c45339075f682649450 Related-Bug: #1929752 Change-Id: Id3fc3291c8ea7f0f0c29af1b6e3513e4fa97311d --- manifests/profile/base/keystone.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/profile/base/keystone.pp b/manifests/profile/base/keystone.pp index 8408ec15b..ed6c6edb3 100644 --- a/manifests/profile/base/keystone.pp +++ b/manifests/profile/base/keystone.pp @@ -235,7 +235,7 @@ class tripleo::profile::base::keystone ( if $step >= 4 or ( $step >= 3 and $sync_db ) { $oslomsg_rpc_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_rpc_use_ssl))) $oslomsg_notify_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_notify_use_ssl))) - $memcached_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211') + $memcached_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ":${memcached_port}") class { '::keystone': sync_db => $sync_db,