From 71c23779ee676b3d97b7d0eb03d0802f0c283468 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guilherme=20Steinm=C3=BCller?= <gsteinmuller@vexxhost.com>
Date: Mon, 16 Mar 2020 15:11:30 +0000
Subject: [PATCH] Refactor memcached_servers

This patch aims to add a prefix for memcached_server
on each role to give the ability for deployers to
override the location of memcached cluster. I.e users
wants to create a single memcached cluster with k8s
for each service.

We also add pymemcache based on [1]

[1] https://review.opendev.org/711429

Change-Id: I571a0ac9417767af413937e871ea6cdf156f2d75
---
 defaults/main.yml       | 4 ++++
 templates/trove.conf.j2 | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 04d01a6..0a2678d 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -197,11 +197,15 @@ trove_pip_packages:
   - osprofiler
   - pexpect
   - PyMySQL
+  - pymemcache
   - python-troveclient
   - python-memcached
   - systemd-python
   - trove
 
+# Memcached override
+trove_memcached_servers: "{{ memcached_servers }}"
+
 trove_optional_oslomsg_amqp1_pip_packages:
   - oslo.messaging[amqp1]
 
diff --git a/templates/trove.conf.j2 b/templates/trove.conf.j2
index 189b44d..3c812cd 100644
--- a/templates/trove.conf.j2
+++ b/templates/trove.conf.j2
@@ -92,7 +92,7 @@ username = {{ trove_service_user_name }}
 password = {{ trove_service_password }}
 region_name = {{ keystone_service_region }}
 
-memcached_servers = {{ memcached_servers }}
+memcached_servers = {{ trove_memcached_servers }}
 token_cache_time = 300
 
 # if your memcached server is shared, use these settings to avoid cache poisoning