From 9988a7573468eab5a6fd5e1e05d240dcc3c0989b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guilherme=20Steinm=C3=BCller?= Date: Mon, 16 Mar 2020 13:33:53 +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: I64614a02bd3a0d99a69a9c7ac59552ba7cb1fc88 --- defaults/main.yml | 4 ++++ templates/cloudkitty.conf.j2 | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/defaults/main.yml b/defaults/main.yml index e897db9..2dc2a58 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -148,11 +148,15 @@ cloudkitty_pip_packages: - msgpack-python - osprofiler - PyMySQL + - pymemcache - python-memcached - SQLAlchemy>=1.0.10 - systemd-python - tooz +# Memcached override +cloudkitty_memcached_servers: "{{ memcached_servers }}" + ## (Qdrouterd) integration # TODO(ansmith): Change structure when more backends will be supported cloudkitty_oslomsg_amqp1_enabled: "{{ cloudkitty_oslomsg_rpc_transport == 'amqp' }}" diff --git a/templates/cloudkitty.conf.j2 b/templates/cloudkitty.conf.j2 index 71a6b04..ae75939 100644 --- a/templates/cloudkitty.conf.j2 +++ b/templates/cloudkitty.conf.j2 @@ -25,7 +25,7 @@ collector = {{ cloudkitty_collector }} connection = {{ cloudkitty_database_connection }} [keystone_authtoken] -memcached_servers = {{ memcached_servers }} +memcached_servers = {{ cloudkitty_memcached_servers }} www_authenticate_uri = {{ keystone_service_internaluri }} project_domain_id = {{ cloudkitty_service_project_domain_id }} project_name = {{ cloudkitty_service_project_name }}