openstack/puppet-watcher
Code Issues Proposed changes

Stop hard-coding config file for db sync

Browse Source 
The watcher-db-manage command by default loads
/etc/watcher/watcher.conf. Removing the override allows us to use
additional paths such as watcher.conf.d in the future.

Change-Id: Ide53b1659e336f461bb5108621c31299cb211c3f
This commit is contained in:
Takashi Kajinami 2024-03-05 12:32:55 +09:00
parent a918bf9ea7
commit 844e163656
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/db/create_schema.pp
View File

@ -6,10 +6,10 @@
# [*extra_params*] # [*extra_params*]
# (Optional) String of extra command line parameters to append # (Optional) String of extra command line parameters to append
# to the watcher-db-manage create_schema command. # to the watcher-db-manage create_schema command.
# Defaults to '--config-file /etc/watcher/watcher.conf' # Defaults to ''
# #
class watcher::db::create_schema( class watcher::db::create_schema(
$extra_params = '--config-file /etc/watcher/watcher.conf', $extra_params = '',
) { ) {
include watcher::deps include watcher::deps

4
manifests/db/upgrade.pp
View File

@ -7,10 +7,10 @@
# [*extra_params*] # [*extra_params*]
# (Optional) String of extra command line parameters to append # (Optional) String of extra command line parameters to append
# to the watcher-db-manage upgrade command. # to the watcher-db-manage upgrade command.
# Defaults to '--config-file /etc/watcher/watcher.conf' # Defaults to ''
# #
class watcher::db::upgrade( class watcher::db::upgrade(
$extra_params = '--config-file /etc/watcher/watcher.conf', $extra_params = '',
) { ) {
include watcher::deps include watcher::deps

2
spec/classes/watcher_db_create_schema_spec.rb
View File

@ -6,7 +6,7 @@ describe 'watcher::db::create_schema' do
it 'runs watcher-db-manage' do it 'runs watcher-db-manage' do
is_expected.to contain_exec('watcher-db-manage-create_schema').with( is_expected.to contain_exec('watcher-db-manage-create_schema').with(
:command => 'watcher-db-manage --config-file /etc/watcher/watcher.conf create_schema', :command => 'watcher-db-manage create_schema',
:path => '/usr/bin', :path => '/usr/bin',
:user => 'watcher', :user => 'watcher',
:refreshonly => 'true', :refreshonly => 'true',

2
spec/classes/watcher_db_upgrade_spec.rb
View File

@ -6,7 +6,7 @@ describe 'watcher::db::upgrade' do
it 'runs watcher-db-manage' do it 'runs watcher-db-manage' do
is_expected.to contain_exec('watcher-db-manage-upgrade').with( is_expected.to contain_exec('watcher-db-manage-upgrade').with(
:command => 'watcher-db-manage --config-file /etc/watcher/watcher.conf upgrade', :command => 'watcher-db-manage upgrade',
:path => '/usr/bin', :path => '/usr/bin',
:user => 'watcher', :user => 'watcher',
:refreshonly => 'true', :refreshonly => 'true',