openstack
/
puppet-ceilometer
Code Issues Proposed changes

db sync: Add native parameter for --skip-gnocchi-resource-types 

The --skip-gnocchi-resource-types option is required in case gnocchi is
not used as metric backend. Add the native class parameter so that
users can enable this option more easily.

Change-Id: I10b09b12c0ab93c68b3d1ad215730b882736b1cf
This commit is contained in:
Takashi Kajinami 2024-05-02 18:42:33 +09:00
parent a20047d795
commit 4c904d60cd
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
manifests/db/sync.pp
View File

@ -13,16 +13,26 @@
# (Optional) Timeout for the execution of the db_sync
# Defaults to 300
#
# [*skip_gnocchi_resource_types*]
# (Optional) Skip gnocchi resource-types upgrade.
# Defaults to false
#
class ceilometer::db::sync(
$extra_params = undef,
$db_sync_timeout = 300,
$extra_params = undef,
$db_sync_timeout = 300,
Boolean $skip_gnocchi_resource_types = false,
) {
include ceilometer::deps
include ceilometer::params
$skip_opt = $skip_gnocchi_resource_types ? {
true => '--skip-gnocchi-resource-types ',
default => ''
}
exec { 'ceilometer-upgrade':
command => "${::ceilometer::params::dbsync_command} ${extra_params}",
command => "${::ceilometer::params::dbsync_command} ${skip_opt}${extra_params}",
path => '/usr/bin',
user => $::ceilometer::params::user,
refreshonly => true,

7
spec/classes/ceilometer_db_sync_spec.rb
View File

@ -27,13 +27,14 @@ describe 'ceilometer::db::sync' do
describe 'overriding params' do
let :params do
{
:extra_params => '--config-file=/etc/ceilometer/ceilometer_01.conf',
:db_sync_timeout => 750,
:extra_params => '--config-file=/etc/ceilometer/ceilometer_01.conf',
:skip_gnocchi_resource_types => true,
:db_sync_timeout => 750,
}
end
it { is_expected.to contain_exec('ceilometer-upgrade').with(
:command => 'ceilometer-upgrade --config-file=/etc/ceilometer/ceilometer_01.conf',
:command => 'ceilometer-upgrade --skip-gnocchi-resource-types --config-file=/etc/ceilometer/ceilometer_01.conf',
:path => '/usr/bin',
:user => 'ceilometer',
:refreshonly => 'true',