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:
parent
3bf5d9ed3c
commit
b7b040c4e2
|
@ -23,7 +23,7 @@ class gnocchi::db::sync (
|
||||||
include gnocchi::deps
|
include gnocchi::deps
|
||||||
|
|
||||||
exec { 'gnocchi-db-sync':
|
exec { 'gnocchi-db-sync':
|
||||||
command => "gnocchi-upgrade --config-file /etc/gnocchi/gnocchi.conf ${extra_opts}",
|
command => "gnocchi-upgrade ${extra_opts}",
|
||||||
path => '/usr/bin',
|
path => '/usr/bin',
|
||||||
refreshonly => true,
|
refreshonly => true,
|
||||||
user => $user,
|
user => $user,
|
||||||
|
|
|
@ -8,7 +8,7 @@ describe 'gnocchi::db::sync' do
|
||||||
|
|
||||||
it 'runs gnocchi-manage db_sync' do
|
it 'runs gnocchi-manage db_sync' do
|
||||||
is_expected.to contain_exec('gnocchi-db-sync').with(
|
is_expected.to contain_exec('gnocchi-db-sync').with(
|
||||||
:command => 'gnocchi-upgrade --config-file /etc/gnocchi/gnocchi.conf ',
|
:command => 'gnocchi-upgrade ',
|
||||||
:path => '/usr/bin',
|
:path => '/usr/bin',
|
||||||
:user => 'gnocchi',
|
:user => 'gnocchi',
|
||||||
:refreshonly => 'true',
|
:refreshonly => 'true',
|
||||||
|
@ -31,7 +31,7 @@ describe 'gnocchi::db::sync' do
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
it { is_expected.to contain_exec('gnocchi-db-sync').with(
|
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',
|
:path => '/usr/bin',
|
||||||
:user => 'gnocchi',
|
:user => 'gnocchi',
|
||||||
:refreshonly => 'true',
|
:refreshonly => 'true',
|
||||||
|
|
Loading…
Reference in New Issue