diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-10-19 09:14:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-10-19 09:14:35 +0000 |
| commit | 7cf6d3e9e279a3d6072558bf07897f78d6a153bf (patch) | |
| tree | 114b6a80530cf8dc301c40d8cb4620395f0b60bf | |
| parent | ac56f2498c5820548477ee9eb3944a0d1919c7ef (diff) | |
| parent | 8d39cbe249cc3cde2ccaf7aea4795b42470d31ed (diff) | |
| download | kolla-7cf6d3e9e279a3d6072558bf07897f78d6a153bf.tar.gz kolla-7cf6d3e9e279a3d6072558bf07897f78d6a153bf.zip | |
Merge "Fix memcache configuration of manila-share"
| -rw-r--r-- | ansible/roles/manila/templates/manila-share.conf.j2 | 9 |
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 %} |