openstack
/
puppet-magnum
Code Issues Proposed changes

Stop hard-coding config file for db sync 

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

Change-Id: I3efd9b50aace6661409d6dc726b94ec65a6f1410
This commit is contained in:
Takashi Kajinami 2024-03-05 12:24:34 +09:00
parent c36b2dba10
commit 317f62a3bc
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/db/sync.pp
View File

@ -10,7 +10,7 @@
# [*extra_params*] # [*extra_params*]
# (Optional) String of extra command line parameters to append # (Optional) String of extra command line parameters to append
# to the magnum-dbsync command. # to the magnum-dbsync command.
# Defaults to undef # Defaults to ''
# #
# [*exec_path*] # [*exec_path*]
# (Optional) The path to use for finding the magnum-db-manage binary. # (Optional) The path to use for finding the magnum-db-manage binary.
@ -22,7 +22,7 @@
# #
class magnum::db::sync( class magnum::db::sync(
$user = 'magnum', $user = 'magnum',
$extra_params = '--config-file /etc/magnum/magnum.conf', $extra_params = '',
$exec_path = '/usr/bin', $exec_path = '/usr/bin',
$db_sync_timeout = 300, $db_sync_timeout = 300,
) { ) {

4
spec/classes/magnum_db_sync_spec.rb
View File

@ -8,7 +8,7 @@ describe 'magnum::db::sync' do
it 'runs magnum-db-sync' do it 'runs magnum-db-sync' do
is_expected.to contain_exec('magnum-db-sync').with( 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', :path => '/usr/bin',
:user => 'magnum', :user => 'magnum',
:refreshonly => 'true', :refreshonly => 'true',
@ -60,7 +60,7 @@ describe 'magnum::db::sync' do
it { it {
is_expected.to contain_exec('magnum-db-sync').with( 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', :path => '/opt/venvs/magnum/bin',
:user => 'magnum', :user => 'magnum',
:refreshonly => 'true', :refreshonly => 'true',