Merge "Fix memcache configuration of manila-share"

This commit is contained in:
Jenkins 2016-10-19 09:14:35 +00:00 committed by Gerrit Code Review
commit 7cf6d3e9e2

View File

@ -15,6 +15,9 @@ region_name = {{ openstack_region_name }}
project_name = service project_name = service
username = cinder username = cinder
password = {{ cinder_keystone_password }} password = {{ cinder_keystone_password }}
memcache_security_strategy = ENCRYPT
memcache_secret_key = {{ memcache_secret_key }}
memcached_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %} memcached_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %}
[nova] [nova]
@ -27,6 +30,9 @@ region_name = {{ openstack_region_name }}
project_name = service project_name = service
username = {{ nova_keystone_user }} username = {{ nova_keystone_user }}
password = {{ nova_keystone_password }} password = {{ nova_keystone_password }}
memcache_security_strategy = ENCRYPT
memcache_secret_key = {{ memcache_secret_key }}
memcached_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %} memcached_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %}
[neutron] [neutron]
@ -40,6 +46,9 @@ region_name = {{ openstack_region_name }}
project_name = service project_name = service
username = {{ neutron_keystone_user }} username = {{ neutron_keystone_user }}
password = {{ neutron_keystone_password }} password = {{ neutron_keystone_password }}
memcache_security_strategy = ENCRYPT
memcache_secret_key = {{ memcache_secret_key }}
memcached_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %} memcached_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %}
{% if enable_manila_backend_generic | bool %} {% if enable_manila_backend_generic | bool %}