diff options
author | 2017-03-29 16:32:00 +0000 | |
---|---|---|
committer | 2017-03-29 16:32:00 +0000 | |
commit | 79db64bb348424bec33ea07904016fd0a56067e4 (patch) | |
tree | 9bc52715d3f1e2f73c2e874b0ca2e4768c667c80 /manifests/profile/base/ceilometer/collector.pp | |
parent | 413a6947bfe491b21af2a6ca9ea41c27d9459c69 (diff) | |
parent | d11e83bd4f4e75122328cd865c3324c1093ddf72 (diff) |
Merge "Re-run gnocchi and ceilometer upgrade in step 5" into stable/ocata
Diffstat (limited to 'manifests/profile/base/ceilometer/collector.pp')
-rw-r--r-- | manifests/profile/base/ceilometer/collector.pp | 8 |
1 files changed, 8 insertions, 0 deletions
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'], + } + } } |