openstack/puppet-mistral
Code Issues Proposed changes

Stop hard-coding config file for db sync

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

Change-Id: Ia7e988df093e16dd6ad53ce2d2f8e6b340daf887
This commit is contained in:
Takashi Kajinami 2024-03-05 12:31:26 +09:00
parent f5d1ba9844
commit 572fb50018
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/params.pp
View File

@ -7,8 +7,8 @@ class mistral::params {
$pyver3 = $::openstacklib::defaults::pyver3 $pyver3 = $::openstacklib::defaults::pyver3
$client_package = 'python3-mistralclient' $client_package = 'python3-mistralclient'
$db_sync_command = 'mistral-db-manage --config-file=/etc/mistral/mistral.conf upgrade head' $db_sync_command = 'mistral-db-manage upgrade head'
$db_populate_command = 'mistral-db-manage --config-file=/etc/mistral/mistral.conf populate' $db_populate_command = 'mistral-db-manage populate'
$user = 'mistral' $user = 'mistral'
$group = 'mistral' $group = 'mistral'

4
spec/classes/mistral_db_sync_spec.rb
View File

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