From aec471a78d46d839e98026c4cb98acb412a7b424 Mon Sep 17 00:00:00 2001 From: Pradeep Kilambi Date: Mon, 20 Mar 2017 11:44:53 -0400 Subject: Re-run gnocchi and ceilometer upgrade in step 5 Without this gnocchi resources types are not created as they are skipped initially and the resources from ceilometer wont make it to gnocchi. Closes-bug: #1674421 Depends-On: I753f37e121b95813e345f200ad3f3e75ec4bd7e1 Change-Id: Ib45bf1b3e526a58f675d7555fe7bb5038dadeede --- manifests/profile/base/ceilometer/collector.pp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'manifests/profile/base/ceilometer') diff --git a/manifests/profile/base/ceilometer/collector.pp b/manifests/profile/base/ceilometer/collector.pp index 20eab54..6b58286 100644 --- a/manifests/profile/base/ceilometer/collector.pp +++ b/manifests/profile/base/ceilometer/collector.pp @@ -85,4 +85,12 @@ class tripleo::profile::base::ceilometer::collector ( include ::ceilometer::dispatcher::gnocchi } + # Re-run ceilometer-upgrade again in step 5 so gnocchi resource types + # are created safely. + if $step >= 5 and $sync_db { + exec {'ceilometer-db-upgrade': + command => 'ceilometer-upgrade --skip-metering-database', + path => ['/usr/bin', '/usr/sbin'], + } + } } -- cgit 1.2.3-korg