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

diff --git a/defaults/main.yml b/defaults/main.yml
index d3c4eec1..29677dcf 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -187,6 +187,7 @@ ironic_pip_packages:
   - osprofiler
   - proliantutils
   - PyMySQL
+  - pymemcache
   - pysnmp
   - python-dracclient
   - python-ilorest-library
@@ -202,6 +203,9 @@ ironic_inspector_pip_packages:
   - ironic-inspector
   - python-ironic-inspector-client
 
+# Memcached override
+ironic_memcached_servers: "{{ memcached_servers }}"
+
 ## Oslo Messaging Info
 # RPC
 ironic_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group | default('rabbitmq_all') }}"
diff --git a/templates/ironic.conf.j2 b/templates/ironic.conf.j2
index d1410d67..1767a45f 100644
--- a/templates/ironic.conf.j2
+++ b/templates/ironic.conf.j2
@@ -9,7 +9,7 @@ debug = {{ debug }}
 auth_strategy = {{ ironic_auth_strategy }}
 host = {{ inventory_hostname }}
 
-memcached_servers = {{ memcached_servers }}
+memcached_servers = {{ ironic_memcached_servers }}
 enabled_network_interfaces = {{ ironic_enabled_network_interfaces_list }}
 default_network_interface = {{ ironic_default_network_interface }}
 
@@ -131,7 +131,7 @@ username = {{ ironic_service_user_name }}
 password = {{ ironic_service_password }}
 region_name = {{ keystone_service_region }}
 
-memcached_servers = {{ memcached_servers }}
+memcached_servers = {{ ironic_memcached_servers }}
 
 token_cache_time = 300