Merge "Re-run gnocchi and ceilometer upgrade in step 5"

2 files changed, 17 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'],
+    }
+  }
 }
diff --git a/manifests/profile/base/gnocchi/api.pp b/manifests/profile/base/gnocchi/api.pp
index 5b4c0c2..79ee265 100644
--- a/manifests/profile/base/gnocchi/api.pp
+++ b/manifests/profile/base/gnocchi/api.pp
@@ -100,4 +100,13 @@ class tripleo::profile::base::gnocchi::api (
       default: { fail('Unrecognized gnocchi_backend parameter.') }
     }
   }
+
+  # Re-run gnochci upgrade with storage as swift/ceph should be up at this
+  # stage.
+  if $step >= 5 and $sync_db {
+    exec {'run gnocchi upgrade with storage':
+      command => 'gnocchi-upgrade --config-file=/etc/gnocchi/gnocchi.conf',
+      path    => ['/usr/bin', '/usr/sbin'],
+    }
+  }
 }