From 8a63cf45b5f4319a4758324d14ca8e9191c570be Mon Sep 17 00:00:00 2001
From: prameswar <engg.pram1@gmail.com>
Date: Fri, 21 Oct 2016 21:33:41 +0530
Subject: [PATCH] corrected line collapsing in ceilometer.conf
Closes-bug: #1635667
Change-Id: I256a39b6241d5b506f099fb98847af9417748702
---
ansible/roles/ceilometer/templates/ceilometer.conf.j2 | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/ansible/roles/ceilometer/templates/ceilometer.conf.j2 b/ansible/roles/ceilometer/templates/ceilometer.conf.j2
index ef3d88cc35..1a45158305 100644
--- a/ansible/roles/ceilometer/templates/ceilometer.conf.j2
+++ b/ansible/roles/ceilometer/templates/ceilometer.conf.j2
@@ -26,7 +26,6 @@ metering_connection = mysql+pymysql://{{ ceilometer_database_user }}:{{ ceilomet
{% endif %}
[keystone_authtoken]
-memcached_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %}
auth_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}
project_domain_name = Default
project_name = service
@@ -36,6 +35,11 @@ password = {{ ceilometer_keystone_password }}
auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}
auth_type = 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 %}
+
+
[notification]
store_events = true