diff --git a/manifests/db/create_schema.pp b/manifests/db/create_schema.pp index 9e40da2..d8bd1aa 100644 --- a/manifests/db/create_schema.pp +++ b/manifests/db/create_schema.pp @@ -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 diff --git a/manifests/db/upgrade.pp b/manifests/db/upgrade.pp index 9dc79db..ad839bd 100644 --- a/manifests/db/upgrade.pp +++ b/manifests/db/upgrade.pp @@ -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 diff --git a/spec/classes/watcher_db_create_schema_spec.rb b/spec/classes/watcher_db_create_schema_spec.rb index d274e5d..a50a6d6 100644 --- a/spec/classes/watcher_db_create_schema_spec.rb +++ b/spec/classes/watcher_db_create_schema_spec.rb @@ -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', diff --git a/spec/classes/watcher_db_upgrade_spec.rb b/spec/classes/watcher_db_upgrade_spec.rb index 1075c76..5afebe4 100644 --- a/spec/classes/watcher_db_upgrade_spec.rb +++ b/spec/classes/watcher_db_upgrade_spec.rb @@ -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',