From d5be854362a22da43324fb58f51b38b7cf02b605 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guilherme=20Steinm=C3=BCller?= Date: Mon, 16 Mar 2020 14:00:22 +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: If7bbef32ae1102ff586bd765052d984896bde43d --- defaults/main.yml | 4 ++++ templates/magnum.conf.j2 | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index f47b781..8ae5838 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -170,9 +170,13 @@ magnum_pip_packages: - magnum - osprofiler - PyMySQL + - pymemcache - python-memcached - systemd-python +# Memcached override +magnum_memcached_servers: "{{ memcached_servers }}" + # Specific pip packages provided by the user magnum_user_pip_packages: [] diff --git a/templates/magnum.conf.j2 b/templates/magnum.conf.j2 index 68e157d..f6c92c3 100644 --- a/templates/magnum.conf.j2 +++ b/templates/magnum.conf.j2 @@ -38,7 +38,7 @@ auth_uri = {{ keystone_service_publicurl }} www_authenticate_uri = {{ keystone_service_publicurl }} auth_version = v3 insecure = {{ keystone_service_internaluri_insecure | bool }} -memcached_servers = {{ memcached_servers }} +memcached_servers = {{ magnum_memcached_servers }} token_cache_time = 300 auth_type = {{ magnum_keystone_auth_plugin }} auth_url = {{ keystone_service_internaluri }} @@ -54,7 +54,7 @@ auth_uri = {{ keystone_service_publicurl }} www_authenticate_uri = {{ keystone_service_publicurl }} auth_version = v3 insecure = {{ keystone_service_internaluri_insecure | bool }} -memcached_servers = {{ memcached_servers }} +memcached_servers = {{ magnum_memcached_servers }} token_cache_time = 300 auth_type = {{ magnum_keystone_auth_plugin }} auth_url = {{ keystone_service_internaluri }}