From c5dbd1c17ad246943e85728e936143172edeaee6 Mon Sep 17 00:00:00 2001 From: Tobias Urdin Date: Tue, 27 Feb 2018 17:29:28 +0100 Subject: [PATCH] Remove --skip-metering-database for ceilometer The --skip-metering-database argument for the ceilometer-upgrade script has been removed but are still used in the integration code and was missed because Ubuntu was non-voting and RHEL based packages seems to be an older version. This patch depends on the change in puppetceilometer that changes the default value for extra_params [1] [1] https://review.openstack.org/#/c/548599/ Depends-On: I33c1667e19326ec67c5cf953daa1237175895c4f Change-Id: I49f988afa96685b8d44f51525fa2d76731463bbf --- manifests/ceilometer.pp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/manifests/ceilometer.pp b/manifests/ceilometer.pp index 780bab464..b5c0932e5 100644 --- a/manifests/ceilometer.pp +++ b/manifests/ceilometer.pp @@ -54,10 +54,9 @@ class openstack_integration::ceilometer ( configure_endpoint => false, } - # We use Gnocchi/Panko instead of local database - class { '::ceilometer::db::sync': - extra_params => '--skip-metering-database', - } + # We use Gnocchi/Panko instead of local database, db::sync is required to populate + # gnocchi resource types. + include ::ceilometer::db::sync # Ensure Gnocchi and creads are ready before running ceilometer-upgrade Service['httpd'] -> Exec['ceilometer-upgrade'] Class['ceilometer::agent::auth'] -> Exec['ceilometer-upgrade']