From fcf3781459a81142d61ff4483e997720c4eb5f25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guilherme=20Steinm=C3=BCller?= <gsteinmuller@vexxhost.com>
Date: Mon, 16 Mar 2020 14:05:59 +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: I06993827240135365c83bbfd4a75712598a2310a
---
 defaults/main.yml        | 4 ++++
 templates/manila.conf.j2 | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 408d1cb..8165dcf 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -211,11 +211,15 @@ manila_pip_packages:
   - keystonemiddleware
   - osprofiler
   - PyMySQL
+  - pymemcache
   - python-openstackclient
   - python-memcached
   - systemd-python
   - uwsgi
 
+# Memcached override
+manila_memcached_servers: "{{ memcached_servers }}"
+
 manila_user_pip_packages: []
 
 manila_optional_oslomsg_amqp1_pip_packages:
diff --git a/templates/manila.conf.j2 b/templates/manila.conf.j2
index c5fcd71..a85535f 100644
--- a/templates/manila.conf.j2
+++ b/templates/manila.conf.j2
@@ -78,7 +78,7 @@ username = {{ manila_service_user_name }}
 password = {{ manila_service_password }}
 region_name = {{ keystone_service_region }}
 
-memcached_servers = {{ memcached_servers }}
+memcached_servers = {{ manila_memcached_servers }}
 
 token_cache_time = 300
 
@@ -117,4 +117,4 @@ region_name = {{ cinder_service_region | default(manila_service_region) }}
 project_name = {{ cinder_service_project_name | default("service") }}
 username = {{ cinder_service_user_name | default("cinder") }}
 password = {{ cinder_service_password }}
-{% endif %}
\ No newline at end of file
+{% endif %}