From 3b6e6b21e578a44504573aba2b8cfe1603879caa Mon Sep 17 00:00:00 2001 From: liyuenan Date: Wed, 14 Dec 2016 17:12:41 +0800 Subject: Support expansion for newton JIRA: COMPASS-481 Change-Id: I2dc6230f808a62f6b852f0668771b7302c7b540c Signed-off-by: liyuenan --- .../roles/cinder-volume/templates/cinder.conf | 7 ------- 1 file changed, 7 deletions(-) (limited to 'deploy/adapters/ansible/openstack_newton_xenial/roles/cinder-volume/templates/cinder.conf') 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 -- cgit 1.2.3-korg