aboutsummaryrefslogtreecommitdiffstats
path: root/deploy/adapters/ansible/openstack_newton_xenial/roles/ceilometer_compute/templates/ceilometer.conf.j2
diff options
context:
space:
mode:
authorliyuenan <liyuenan@huawei.com>2016-12-14 17:12:41 +0800
committerYuenan Li <liyuenan@huawei.com>2016-12-14 09:21:20 +0000
commit3b6e6b21e578a44504573aba2b8cfe1603879caa (patch)
tree7826fa68fa38f53816edcd3058339b2161478e8a /deploy/adapters/ansible/openstack_newton_xenial/roles/ceilometer_compute/templates/ceilometer.conf.j2
parent8a4b5bd61fc39c259952871c4447297f3184a0ba (diff)
Support expansion for newton
JIRA: COMPASS-481 Change-Id: I2dc6230f808a62f6b852f0668771b7302c7b540c Signed-off-by: liyuenan <liyuenan@huawei.com>
Diffstat (limited to 'deploy/adapters/ansible/openstack_newton_xenial/roles/ceilometer_compute/templates/ceilometer.conf.j2')
-rw-r--r--deploy/adapters/ansible/openstack_newton_xenial/roles/ceilometer_compute/templates/ceilometer.conf.j27
1 files changed, 0 insertions, 7 deletions
diff --git a/deploy/adapters/ansible/openstack_newton_xenial/roles/ceilometer_compute/templates/ceilometer.conf.j2 b/deploy/adapters/ansible/openstack_newton_xenial/roles/ceilometer_compute/templates/ceilometer.conf.j2
index f388df41..bffd6068 100644
--- a/deploy/adapters/ansible/openstack_newton_xenial/roles/ceilometer_compute/templates/ceilometer.conf.j2
+++ b/deploy/adapters/ansible/openstack_newton_xenial/roles/ceilometer_compute/templates/ceilometer.conf.j2
@@ -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]
verbose = True
rpc_backend = rabbit
@@ -15,7 +9,6 @@ metering_secret = {{ metering_secret }}
[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