From 572fb50018033ff299659d04aef8fce1b47eea3f Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Tue, 5 Mar 2024 12:31:26 +0900 Subject: [PATCH] Stop hard-coding config file for db sync 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 --- manifests/params.pp | 4 ++-- spec/classes/mistral_db_sync_spec.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index 6ad4e37..26b7be4 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -7,8 +7,8 @@ class mistral::params { $pyver3 = $::openstacklib::defaults::pyver3 $client_package = 'python3-mistralclient' - $db_sync_command = 'mistral-db-manage --config-file=/etc/mistral/mistral.conf upgrade head' - $db_populate_command = 'mistral-db-manage --config-file=/etc/mistral/mistral.conf populate' + $db_sync_command = 'mistral-db-manage upgrade head' + $db_populate_command = 'mistral-db-manage populate' $user = 'mistral' $group = 'mistral' diff --git a/spec/classes/mistral_db_sync_spec.rb b/spec/classes/mistral_db_sync_spec.rb index c41d7e7..5cf7774 100644 --- a/spec/classes/mistral_db_sync_spec.rb +++ b/spec/classes/mistral_db_sync_spec.rb @@ -9,7 +9,7 @@ describe 'mistral::db::sync' do it 'runs mistral-db-manage upgrade head' do 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', :user => 'mistral', :refreshonly => 'true', @@ -25,7 +25,7 @@ describe 'mistral::db::sync' do ) 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', :user => 'mistral', :refreshonly => 'true',