Merge "Stop hard-coding config file for db sync"
This commit is contained in:
commit
4bf621349e
@ -10,7 +10,7 @@
|
||||
# [*extra_params*]
|
||||
# (Optional) String of extra command line parameters to append
|
||||
# to the magnum-dbsync command.
|
||||
# Defaults to undef
|
||||
# Defaults to ''
|
||||
#
|
||||
# [*exec_path*]
|
||||
# (Optional) The path to use for finding the magnum-db-manage binary.
|
||||
@ -22,7 +22,7 @@
|
||||
#
|
||||
class magnum::db::sync(
|
||||
$user = 'magnum',
|
||||
$extra_params = '--config-file /etc/magnum/magnum.conf',
|
||||
$extra_params = '',
|
||||
$exec_path = '/usr/bin',
|
||||
$db_sync_timeout = 300,
|
||||
) {
|
||||
|
@ -8,7 +8,7 @@ describe 'magnum::db::sync' do
|
||||
|
||||
it 'runs magnum-db-sync' do
|
||||
is_expected.to contain_exec('magnum-db-sync').with(
|
||||
:command => 'magnum-db-manage --config-file /etc/magnum/magnum.conf upgrade head',
|
||||
:command => 'magnum-db-manage upgrade head',
|
||||
:path => '/usr/bin',
|
||||
:user => 'magnum',
|
||||
:refreshonly => 'true',
|
||||
@ -60,7 +60,7 @@ describe 'magnum::db::sync' do
|
||||
|
||||
it {
|
||||
is_expected.to contain_exec('magnum-db-sync').with(
|
||||
:command => 'magnum-db-manage --config-file /etc/magnum/magnum.conf upgrade head',
|
||||
:command => 'magnum-db-manage upgrade head',
|
||||
:path => '/opt/venvs/magnum/bin',
|
||||
:user => 'magnum',
|
||||
:refreshonly => 'true',
|
||||
|
Loading…
Reference in New Issue
Block a user