From f879305e124e740fba0957cad61ee7a7cb228b86 Mon Sep 17 00:00:00 2001
From: Pradeep Kilambi <pkilambi@redhat.com>
Date: Tue, 4 Apr 2017 09:52:04 -0400
Subject: [PATCH] Set a dependency on collector

Its better to restart collector after the ceilo-upgrade is done
so that the dispatchers are loaded and communicate with other
services like gnocchi and panko and dispatch data. Otherwise
user has to retsrat collector sometimes.

Closes-bug: #1680126

Change-Id: Ib23913d698199ca87658e28e99acb5d56cebd858
(cherry picked from commit 5a4a1b99b8f7cb8a9299fa2e8d8184706329730c)
---
 elements/puppet-stack-config/puppet-stack-config.pp        | 4 +++-
 releasenotes/notes/restart-collector-b043489fcdf1e9c7.yaml | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 releasenotes/notes/restart-collector-b043489fcdf1e9c7.yaml

diff --git a/elements/puppet-stack-config/puppet-stack-config.pp b/elements/puppet-stack-config/puppet-stack-config.pp
index 5debfe799..5119aa8a9 100644
--- a/elements/puppet-stack-config/puppet-stack-config.pp
+++ b/elements/puppet-stack-config/puppet-stack-config.pp
@@ -201,8 +201,10 @@ if str2bool(hiera('enable_telemetry', true)) {
   }
 
 # Ensure all endpoint exists and only then run the upgrade.
+# ensure we restart ceilometer collector as well
   Keystone::Resource::Service_identity<||> ->
-  Openstacklib::Service_validation['gnocchi-status'] -> Exec['ceilo-gnocchi-upgrade']
+  Openstacklib::Service_validation['gnocchi-status'] ->
+  Exec['ceilo-gnocchi-upgrade'] ~> Service['ceilometer-collector']
 
   Cron <| title == 'ceilometer-expirer' |> { command =>
     "sleep $((\$(od -A n -t d -N 3 /dev/urandom) % 86400)) && ${::ceilometer::params::expirer_command}" }
diff --git a/releasenotes/notes/restart-collector-b043489fcdf1e9c7.yaml b/releasenotes/notes/restart-collector-b043489fcdf1e9c7.yaml
new file mode 100644
index 000000000..1a3a29751
--- /dev/null
+++ b/releasenotes/notes/restart-collector-b043489fcdf1e9c7.yaml
@@ -0,0 +1,4 @@
+---
+fixes:
+  - Add a dependency to restart collector after other services are
+    up and ceilometer upgrade is complete.