diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-03-28 18:22:56 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-03-28 18:22:56 +0000 |
commit | c128380c0b3661784528a05b424cc899042f0a14 (patch) | |
tree | e179598d8c4d614772df12168cf6e27625474c99 /manifests/profile/base/ceilometer/collector.pp | |
parent | a526c10ac920abd4b55321764221875c80dd3bb8 (diff) | |
parent | aec471a78d46d839e98026c4cb98acb412a7b424 (diff) |
Merge "Re-run gnocchi and ceilometer upgrade in step 5"
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'], + } + } } |