From cb74a2d242e9dc6bbfafef028a1d46da3b2e39d5 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Mon, 11 Sep 2023 13:17:27 +0900 Subject: [PATCH] Fix undefined variables detected in unit tests ... because these cause hard-failure in Puppet 8. Change-Id: I634af25ea7076b7462fba49f956fbe5042a14c62 --- manifests/db.pp | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/manifests/db.pp b/manifests/db.pp index 050c55d..b7e2df2 100644 --- a/manifests/db.pp +++ b/manifests/db.pp @@ -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:: if murano::db:: 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:: if murano::db:: 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,