From 2e89f8ede8369d0a7445599d18ac562ca91e9ad0 Mon Sep 17 00:00:00 2001 From: Pradeep Kilambi Date: Tue, 18 Apr 2017 19:14:16 -0400 Subject: Move ceilometer upgrade re-run out of collector Since collector is deprecated, lets move this out of collector.pp so it gets run and resource types are created appropriately even when collector is not included. Closes-bug: #1676961 Change-Id: I32445a891c34f519ab16dcecc81993f8909f6481 --- manifests/profile/base/ceilometer/collector.pp | 9 --------- 1 file changed, 9 deletions(-) (limited to 'manifests/profile/base/ceilometer/collector.pp') diff --git a/manifests/profile/base/ceilometer/collector.pp b/manifests/profile/base/ceilometer/collector.pp index 6b58286..a2c1e29 100644 --- a/manifests/profile/base/ceilometer/collector.pp +++ b/manifests/profile/base/ceilometer/collector.pp @@ -84,13 +84,4 @@ class tripleo::profile::base::ceilometer::collector ( include ::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