From 899ca96af5345a6db6d0c26ff811b02542b4b81c Mon Sep 17 00:00:00 2001
From: Volodymyr Kornylyuk <vkornylyuk@mirantis.com>
Date: Fri, 23 Sep 2016 12:13:41 +0300
Subject: [PATCH] Fix ceilometer polling interval, mongo url

- changes polling interval from 600 to 60
- removes mongo url from database/connection in ceilometer.conf

Change-Id: Idf0f0fcd8e1c5525faeca52c5cbcc99305b707d1
---
 deployment_scripts/puppet/manifests/configure-compute.pp | 4 ++++
 deployment_scripts/puppet/manifests/configure.pp         | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/deployment_scripts/puppet/manifests/configure-compute.pp b/deployment_scripts/puppet/manifests/configure-compute.pp
index 3c0a77f..6cb4091 100644
--- a/deployment_scripts/puppet/manifests/configure-compute.pp
+++ b/deployment_scripts/puppet/manifests/configure-compute.pp
@@ -15,3 +15,7 @@ if hiera('telemetry::kafka::enabled') {
   service { 'ceilometer-polling':}
 
 }
+
+exec { 'fix polling interval':
+  command => '/bin/sed -i \'s/interval: 600/interval: 60/g\' /etc/ceilometer/pipeline.yaml'
+}
diff --git a/deployment_scripts/puppet/manifests/configure.pp b/deployment_scripts/puppet/manifests/configure.pp
index 3e44218..02cb113 100644
--- a/deployment_scripts/puppet/manifests/configure.pp
+++ b/deployment_scripts/puppet/manifests/configure.pp
@@ -95,6 +95,9 @@ if hiera('telemetry::kafka::enabled') {
 
   ceilometer_config { 'compute/resource_update_interval':           value => 600 }
 
+  # remove mongo url
+  ceilometer_config { 'database/connection':                        ensure => absent }
+
   # Coordination
   $zookeeper_list = hiera('telemetry::kafka::zookeeper_list')
   $zookeeper_url  = "zookeeper://${zookeeper_list}"