openstack
/
puppet-gnocchi
Code Issues Proposed changes

Stop hard-coding config file for db sync 

The gnocchi-upgrade command by default loads /etc/gnocchi/gnocchi.conf.
Removing the override allows us to use additional paths such as
gnocchi.conf.d in the future.

Change-Id: Ibe0c1138eebeb17fb6d06a7e648eab563f47fe1f
This commit is contained in:
Takashi Kajinami 2024-03-05 12:25:45 +09:00
parent 3bf5d9ed3c
commit b7b040c4e2
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/db/sync.pp
View File

@ -23,7 +23,7 @@ class gnocchi::db::sync (
include gnocchi::deps
exec { 'gnocchi-db-sync':
command => "gnocchi-upgrade --config-file /etc/gnocchi/gnocchi.conf ${extra_opts}",
command => "gnocchi-upgrade ${extra_opts}",
path => '/usr/bin',
refreshonly => true,
user => $user,

4
spec/classes/gnocchi_db_sync_spec.rb
View File

@ -8,7 +8,7 @@ describe 'gnocchi::db::sync' do
it 'runs gnocchi-manage db_sync' do
is_expected.to contain_exec('gnocchi-db-sync').with(
:command => 'gnocchi-upgrade --config-file /etc/gnocchi/gnocchi.conf ',
:command => 'gnocchi-upgrade ',
:path => '/usr/bin',
:user => 'gnocchi',
:refreshonly => 'true',
@ -31,7 +31,7 @@ describe 'gnocchi::db::sync' do
}
end
it { is_expected.to contain_exec('gnocchi-db-sync').with(
:command => 'gnocchi-upgrade --config-file /etc/gnocchi/gnocchi.conf --skip-storage',
:command => 'gnocchi-upgrade --skip-storage',
:path => '/usr/bin',
:user => 'gnocchi',
:refreshonly => 'true',