Merge "Stop hard-coding config file for db sync"
This commit is contained in:
commit
ffdd2fba06
@ -6,10 +6,10 @@
|
||||
# [*extra_params*]
|
||||
# (Optional) String of extra command line parameters to append
|
||||
# to the watcher-db-manage create_schema command.
|
||||
# Defaults to '--config-file /etc/watcher/watcher.conf'
|
||||
# Defaults to ''
|
||||
#
|
||||
class watcher::db::create_schema(
|
||||
$extra_params = '--config-file /etc/watcher/watcher.conf',
|
||||
$extra_params = '',
|
||||
) {
|
||||
|
||||
include watcher::deps
|
||||
|
@ -7,10 +7,10 @@
|
||||
# [*extra_params*]
|
||||
# (Optional) String of extra command line parameters to append
|
||||
# to the watcher-db-manage upgrade command.
|
||||
# Defaults to '--config-file /etc/watcher/watcher.conf'
|
||||
# Defaults to ''
|
||||
#
|
||||
class watcher::db::upgrade(
|
||||
$extra_params = '--config-file /etc/watcher/watcher.conf',
|
||||
$extra_params = '',
|
||||
) {
|
||||
|
||||
include watcher::deps
|
||||
|
@ -6,7 +6,7 @@ describe 'watcher::db::create_schema' do
|
||||
|
||||
it 'runs watcher-db-manage' do
|
||||
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',
|
||||
:user => 'watcher',
|
||||
:refreshonly => 'true',
|
||||
|
@ -6,7 +6,7 @@ describe 'watcher::db::upgrade' do
|
||||
|
||||
it 'runs watcher-db-manage' do
|
||||
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',
|
||||
:user => 'watcher',
|
||||
:refreshonly => 'true',
|
||||
|
Loading…
Reference in New Issue
Block a user