openstack
/
puppet-murano
Code Issues Proposed changes

Fix undefined variables detected in unit tests 

... because these cause hard-failure in Puppet 8.

Change-Id: I634af25ea7076b7462fba49f956fbe5042a14c62
This commit is contained in:
Takashi Kajinami 2023-09-11 13:17:27 +09:00
parent 840927a91c
commit cb74a2d242
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
manifests/db.pp
View File

@ -57,14 +57,23 @@ class murano::db (
include murano::deps
# NOTE(aderyugin): In order to keep backward compatibility we rely on the pick function
# to use murano::<myparam> if murano::db::<myparam> isn't specified.
$database_connection_real = pick($::murano::database_connection, $database_connection)
$database_connection_recycle_time_real = pick($::murano::database_idle_timeout, $database_connection_recycle_time)
$database_max_pool_size_real = pick($::murano::database_max_pool_size, $database_max_pool_size)
$database_max_retries_real = pick($::murano::database_max_retries, $database_max_retries)
$database_retry_interval_real = pick($::murano::database_retry_interval, $database_retry_interval)
$database_max_overflow_real = pick($::murano::database_max_overflow, $database_max_overflow)
if defined(Class['murano']) {
# NOTE(aderyugin): In order to keep backward compatibility we rely on the pick function
# to use murano::<myparam> if murano::db::<myparam> isn't specified.
$database_connection_real = pick($::murano::database_connection, $database_connection)
$database_connection_recycle_time_real = pick($::murano::database_idle_timeout, $database_connection_recycle_time)
$database_max_pool_size_real = pick($::murano::database_max_pool_size, $database_max_pool_size)
$database_max_retries_real = pick($::murano::database_max_retries, $database_max_retries)
$database_retry_interval_real = pick($::murano::database_retry_interval, $database_retry_interval)
$database_max_overflow_real = pick($::murano::database_max_overflow, $database_max_overflow)
} else {
$database_connection_real = $database_connection
$database_connection_recycle_time_real = $database_connection_recycle_time
$database_max_pool_size_real = $database_max_pool_size
$database_max_retries_real = $database_max_retries
$database_retry_interval_real = $database_retry_interval
$database_max_overflow_real = $database_max_overflow
}
oslo::db { 'murano_config':
connection => $database_connection_real,