openstack
/
puppet-openstack-integration
Code Issues Proposed changes

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
(cherry picked from commit c5dbd1c17a)
This commit is contained in:
Tobias Urdin 2018-02-27 17:29:28 +01:00
parent f76ed87e6d
commit 912c7308aa
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/ceilometer.pp
View File

@ -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']