aboutsummaryrefslogtreecommitdiffstats
path: root/manifests/profile/base/ceilometer/collector.pp
diff options
context:
space:
mode:
authorPradeep Kilambi <pkilambi@redhat.com>2017-04-18 19:14:16 -0400
committerPradeep Kilambi <pkilambi@redhat.com>2017-04-21 14:50:46 +0000
commit2e89f8ede8369d0a7445599d18ac562ca91e9ad0 (patch)
treec56def984ef5feea73912b29ba027b93c7cf8669 /manifests/profile/base/ceilometer/collector.pp
parent2abcfb46d27d3509081839d6a7e2d3bd3255b32e (diff)
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
Diffstat (limited to 'manifests/profile/base/ceilometer/collector.pp')
-rw-r--r--manifests/profile/base/ceilometer/collector.pp9
1 files changed, 0 insertions, 9 deletions
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'],
- }
- }
}