openstack/puppet-heat
Code Issues Proposed changes

Stop hard-coding config file for db sync

Browse Source 
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
This commit is contained in:
Takashi Kajinami 2024-03-05 12:23:14 +09:00
parent fb2d047f0c
commit 14eca21f0e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/db/sync.pp
View File

@ -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,
) {

2
spec/classes/heat_db_sync_spec.rb
View File

@ -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',