aboutsummaryrefslogtreecommitdiffstats
path: root/deploy/adapters/ansible/openstack_newton_xenial/roles/ceilometer_compute/templates/ceilometer.conf.j2
diff options
context:
space:
mode:
authorJustin chi <chigang@huawei.com>2016-12-15 08:51:22 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-12-15 08:51:22 +0000
commitf61c75bab4c8c6c0b08765bef8b5f75e87db6565 (patch)
tree182b81536411051e2208e2ee2c1861446eb0e5a2 /deploy/adapters/ansible/openstack_newton_xenial/roles/ceilometer_compute/templates/ceilometer.conf.j2
parente547df4ebe7df64d971326b110d8c36b1dd3e096 (diff)
parent3b6e6b21e578a44504573aba2b8cfe1603879caa (diff)
Merge "Support expansion for newton"
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