openstack/openstack-ansible-os_manila
Code Issues Proposed changes

Merge "Refactor memcached_servers"

Browse Source
This commit is contained in:
Zuul 2020-03-17 17:10:33 +00:00 committed by Gerrit Code Review
commit c2b44a9c0b
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
defaults/main.yml
View File

@ -212,11 +212,15 @@ manila_pip_packages:
- keystonemiddleware - keystonemiddleware
- osprofiler - osprofiler
- PyMySQL - PyMySQL
- pymemcache
- python-openstackclient - python-openstackclient
- python-memcached - python-memcached
- systemd-python - systemd-python
- uwsgi - uwsgi
# Memcached override
manila_memcached_servers: "{{ memcached_servers }}"
manila_user_pip_packages: [] manila_user_pip_packages: []
manila_optional_oslomsg_amqp1_pip_packages: manila_optional_oslomsg_amqp1_pip_packages:

4
templates/manila.conf.j2
View File

@ -78,7 +78,7 @@ username = {{ manila_service_user_name }}
password = {{ manila_service_password }} password = {{ manila_service_password }}
region_name = {{ keystone_service_region }} region_name = {{ keystone_service_region }}
memcached_servers = {{ memcached_servers }} memcached_servers = {{ manila_memcached_servers }}
token_cache_time = 300 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") }} project_name = {{ cinder_service_project_name | default("service") }}
username = {{ cinder_service_user_name | default("cinder") }} username = {{ cinder_service_user_name | default("cinder") }}
password = {{ cinder_service_password }} password = {{ cinder_service_password }}
{% endif %} {% endif %}