From 19fec5d9d06a84e7dd21e1e60784b48365b34902 Mon Sep 17 00:00:00 2001
From: Alex Schultz <aschultz@redhat.com>
Date: Fri, 15 Mar 2019 14:21:45 -0600
Subject: [PATCH] Enable authtoken cache

For the undercloud we can specify memcache that can be shared by all the
services. Additionally because we need to still allow folks to configure
UndercloudExtraConfig we set it to deep_merge

Change-Id: I07f9a8e9c454a5e41d0a8b766d5d754f63126b90
Closes-Bug: #1820342
---
 environments/undercloud.yaml | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/environments/undercloud.yaml b/environments/undercloud.yaml
index c8c14785dc..58506c8217 100644
--- a/environments/undercloud.yaml
+++ b/environments/undercloud.yaml
@@ -1,3 +1,7 @@
+parameter_merge_strategies:
+  default: overwrite
+  UndercloudExtraConfig: deep_merge
+
 resource_registry:
   OS::TripleO::Services::Tmpwatch: ../deployment/logrotate/tmpwatch-install.yaml
   OS::TripleO::Network::Ports::RedisVipPort: ../network/ports/noop.yaml
@@ -171,3 +175,32 @@ parameter_defaults:
   # https://bugs.launchpad.net/tripleo/+bug/1791238
   KeepalivedRestart: true
   SshFirewallAllowAll: true
+  UndercloudExtraConfig:
+    aodh::keystone::authtoken::memcached_servers: "%{hiera('memcached::listen_ip')}:11211"
+    barbican::keystone::authtoken::memcached_servers: "%{hiera('memcached::listen_ip')}:11211"
+    ceilometer::keystone::authtoken::memcached_servers: "%{hiera('memcached::listen_ip')}:11211"
+    cinder::keystone::authtoken::memcached_servers: "%{hiera('memcached::listen_ip')}:11211"
+    congress::keystone::authtoken::memcached_servers: "%{hiera('memcached::listen_ip')}:11211"
+    ec2api::keystone::authtoken::memcached_servers: "%{hiera('memcached::listen_ip')}:11211"
+    glance::api::authtoken::memcached_servers: "%{hiera('memcached::listen_ip')}:11211"
+    gnocchi::keystone::authtoken::memcached_servers: "%{hiera('memcached::listen_ip')}:11211"
+    heat::keystone::authtoken::memcached_servers: "%{hiera('memcached::listen_ip')}:11211"
+    heat::cache::memcache_servers: "%{hiera('memcached::listen_ip')}:11211"
+    horizon::cache_server_ip: "%{hiera('memcached::listen_ip')}:11211"
+    ironic::api::authtoken::memcached_servers: "%{hiera('memcached::listen_ip')}:11211"
+    ironic::inspector::authtoken::memcached_servers: "%{hiera('memcached::listen_ip')}:11211"
+    keystone::cache_memcache_servers: "%{hiera('memcached::listen_ip')}:11211"
+    manila::keystone::authtoken::memcached_servers: "%{hiera('memcached::listen_ip')}:11211"
+    manila::keystone::authtoken::memcached_servers: "%{hiera('memcached::listen_ip')}:11211"
+    mistral::keystone::authtoken::memcached_servers: "%{hiera('memcached::listen_ip')}:11211"
+    neutron::keystone::authtoken::memcached_servers: "%{hiera('memcached::listen_ip')}:11211"
+    nova::keystone::authtoken::memcached_servers: "%{hiera('memcached::listen_ip')}:11211"
+    nova::cache::memcache_servers: "%{hiera('memcached::listen_ip')}:11211"
+    nova::keystone::authtoken::memcached_servers: "%{hiera('memcached::listen_ip')}:11211"
+    panko::keystone::authtoken::memcached_servers: "%{hiera('memcached::listen_ip')}:11211"
+    sahara::keystone::authtoken::memcached_servers: "%{hiera('memcached::listen_ip')}:11211"
+    swift::proxy::authtoken::memcache_servers: "%{hiera('memcached::listen_ip')}:11211"
+    swift::proxy::cache::memcache_servers: "%{hiera('memcached::listen_ip')}:11211"
+    tacker::keystone::authtoken::memcached_servers: "%{hiera('memcached::listen_ip')}:11211"
+    zaqar::keystone::authtoken::memcached_servers: "%{hiera('memcached::listen_ip')}:11211"
+    swift::objectexpirer::memcached_servers: "%{hiera('memcached::listen_ip')}:11211"