diff options
| author |   Justin chi <chigang@huawei.com> | 2016-12-15 08:51:22 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-12-15 08:51:22 +0000 |
| commit | f61c75bab4c8c6c0b08765bef8b5f75e87db6565 (patch) | |
| tree | 182b81536411051e2208e2ee2c1861446eb0e5a2 /deploy/adapters/ansible/openstack_newton_xenial/roles/cinder-volume/templates/cinder.conf | |
| parent | e547df4ebe7df64d971326b110d8c36b1dd3e096 (diff) | |
| parent | 3b6e6b21e578a44504573aba2b8cfe1603879caa (diff) | |
Merge "Support expansion for newton"
Diffstat (limited to 'deploy/adapters/ansible/openstack_newton_xenial/roles/cinder-volume/templates/cinder.conf')
| -rw-r--r-- | deploy/adapters/ansible/openstack_newton_xenial/roles/cinder-volume/templates/cinder.conf | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/deploy/adapters/ansible/openstack_newton_xenial/roles/cinder-volume/templates/cinder.conf b/deploy/adapters/ansible/openstack_newton_xenial/roles/cinder-volume/templates/cinder.conf index e4f98e82..e7946b5c 100644 --- a/deploy/adapters/ansible/openstack_newton_xenial/roles/cinder-volume/templates/cinder.conf +++ b/deploy/adapters/ansible/openstack_newton_xenial/roles/cinder-volume/templates/cinder.conf @@ -1,9 +1,3 @@ -{% set memcached_servers = [] %} -{% for host in haproxy_hosts.values() %} -{% set _ = memcached_servers.append('%s:11211'% host) %} -{% endfor %} -{% set memcached_servers = memcached_servers|join(',') %} - [DEFAULT] rootwrap_config = /etc/cinder/rootwrap.conf api_paste_confg = /etc/cinder/api-paste.ini @@ -59,7 +53,6 @@ idle_timeout = 30 [keystone_authtoken] auth_uri = http://{{ internal_vip.ip }}:5000 auth_url = http://{{ internal_vip.ip }}:35357 -memcached_servers = {{ memcached_servers }} auth_type = password project_domain_name = default user_domain_name = default |