diff --git a/defaults/main.yml b/defaults/main.yml index 3218c92..2dbfcad 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -212,11 +212,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 %}