From e678ed724d896abc17088ea34d1d732392434c07 Mon Sep 17 00:00:00 2001
From: Roman Babyuk <rbabyuk@mirantis.com>
Date: Fri, 7 Oct 2016 22:07:24 +0300
Subject: [PATCH] Fix for 'refreshing' ceilometer-polling to cover kafka
 enabled or disabled scenarios

Change-Id: I8264599f88bc519b1e0f8155c97d6a9e6d28365c
---
 deployment_scripts/puppet/manifests/configure-compute.pp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/deployment_scripts/puppet/manifests/configure-compute.pp b/deployment_scripts/puppet/manifests/configure-compute.pp
index bc80a18..d2bc13f 100644
--- a/deployment_scripts/puppet/manifests/configure-compute.pp
+++ b/deployment_scripts/puppet/manifests/configure-compute.pp
@@ -1,6 +1,8 @@
 
 notice('MODULAR: fuel-plugin-telemetry: configure-compute.pp')
 
+service { 'ceilometer-polling':}
+
 if hiera('telemetry::kafka::enabled') {
 
   package { 'python-kafka':
@@ -16,9 +18,9 @@ if hiera('telemetry::kafka::enabled') {
     'DEFAULT/transport_url':                      value => $kafka_url;
     'DEFAULT/shuffle_time_before_polling_task':   value => 300;
     'compute/resource_update_interval':           value => 600;
-  } ~>
-  service { 'ceilometer-polling':}
+  }
 
+  Ceilometer_config<||> ~> Service['ceilometer-polling']
 }
 
 exec { 'fix polling interval':