aboutsummaryrefslogtreecommitdiff
path: root/ansible
diff options
context:
space:
mode:
authorzhubingbing <1392607554@qq.com>2016-10-19 12:30:05 +0800
committerzhubingbing <1392607554@qq.com>2016-10-19 14:55:32 +0800
commit8d39cbe249cc3cde2ccaf7aea4795b42470d31ed (patch)
tree8691a6d31762b271050687d2124f74989228c82f /ansible
parent97686e9fab5d441a2a2508f9b6b34b44e853c73a (diff)
downloadkolla-8d39cbe249cc3cde2ccaf7aea4795b42470d31ed.tar.gz
kolla-8d39cbe249cc3cde2ccaf7aea4795b42470d31ed.zip
Fix memcache configuration of manila-share
TrivialFix Change-Id: I1e900ef3a13222eeeb7bad3b53c1c91f82d8a8fa
Diffstat (limited to 'ansible')
-rw-r--r--ansible/roles/manila/templates/manila-share.conf.j29
1 files changed, 9 insertions, 0 deletions
diff --git a/ansible/roles/manila/templates/manila-share.conf.j2 b/ansible/roles/manila/templates/manila-share.conf.j2
index 69322cfbf..cd15fd10e 100644
--- a/ansible/roles/manila/templates/manila-share.conf.j2
+++ b/ansible/roles/manila/templates/manila-share.conf.j2
@@ -15,6 +15,9 @@ region_name = {{ openstack_region_name }}
project_name = service
username = cinder
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 %}
[nova]
@@ -27,6 +30,9 @@ region_name = {{ openstack_region_name }}
project_name = service
username = {{ nova_keystone_user }}
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 %}
[neutron]
@@ -40,6 +46,9 @@ region_name = {{ openstack_region_name }}
project_name = service
username = {{ neutron_keystone_user }}
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 %}
{% if enable_manila_backend_generic | bool %}