From 14eca21f0e2859c0be73faa17b24f8f0ddcc3d92 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Tue, 5 Mar 2024 12:23:14 +0900 Subject: [PATCH] Stop hard-coding config file for db sync The heat-manage command by default loads /etc/heat/heat.conf. Removing the override allows us to use additional paths such as heat.conf.d in the future. Change-Id: Id015bab7ad0dff14788bbabfe54ebae128b037b7 --- manifests/db/sync.pp | 4 ++-- spec/classes/heat_db_sync_spec.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/db/sync.pp b/manifests/db/sync.pp index dab7f13e..6a4d5697 100644 --- a/manifests/db/sync.pp +++ b/manifests/db/sync.pp @@ -7,14 +7,14 @@ # (Optional) String of extra command line parameters to append # to the heat-manage db_sync command. These will be inserted # in the command line between 'heat-manage' and 'db_sync'. -# Defaults to '--config-file /etc/heat/heat.conf' +# Defaults to '' # # [*db_sync_timeout*] # (Optional) Timeout for the execution of the db_sync # Defaults to 300 # class heat::db::sync( - $extra_params = '--config-file /etc/heat/heat.conf', + $extra_params = '', $db_sync_timeout = 300, ) { diff --git a/spec/classes/heat_db_sync_spec.rb b/spec/classes/heat_db_sync_spec.rb index d984144c..6d4983ba 100644 --- a/spec/classes/heat_db_sync_spec.rb +++ b/spec/classes/heat_db_sync_spec.rb @@ -8,7 +8,7 @@ describe 'heat::db::sync' do it 'runs heat-manage db_sync' do is_expected.to contain_exec('heat-dbsync').with( - :command => 'heat-manage --config-file /etc/heat/heat.conf db_sync', + :command => 'heat-manage db_sync', :path => '/usr/bin', :user => 'heat', :refreshonly => 'true',