From 8d39cbe249cc3cde2ccaf7aea4795b42470d31ed Mon Sep 17 00:00:00 2001
From: zhubingbing <1392607554@qq.com>
Date: Wed, 19 Oct 2016 12:30:05 +0800
Subject: [PATCH] Fix memcache configuration of manila-share

TrivialFix

Change-Id: I1e900ef3a13222eeeb7bad3b53c1c91f82d8a8fa
---
 ansible/roles/manila/templates/manila-share.conf.j2 | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/ansible/roles/manila/templates/manila-share.conf.j2 b/ansible/roles/manila/templates/manila-share.conf.j2
index 69322cfbfb..cd15fd10ed 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 %}