openstack/puppet-heat
Code Issues Proposed changes

Remove idle_timeout option

Browse Source 
The idle_timeout parameter has been deprecated for two releases.
We can remove it.

Change-Id: I4c764f182145bf651ce31f6b500cb5039094d91e
This commit is contained in:
ZhongShengping 2020-03-23 14:45:48 +08:00
parent 6184602d86
commit 5a6838f7cd
2 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
manifests/db.pp
View File

@ -46,13 +46,6 @@
# (Optional) Run db sync on nodes after connection setting has been set.
# Defaults to true
#
# DEPRECATED PARAMETERS
#
# [*database_idle_timeout*]
# Timeout when db connections should be reaped.
# Defaults to undef.
#
class heat::db (
$database_connection = 'sqlite:////var/lib/heat/heat.sqlite',
$database_connection_recycle_time = $::os_service_default,
@ -64,21 +57,14 @@ class heat::db (
$database_pool_timeout = $::os_service_default,
$database_db_max_retries = $::os_service_default,
$sync_db = true,
# DEPRECATED PARAMETERS
$database_idle_timeout = undef,
) {
include heat::deps
if $database_idle_timeout {
warning('The database_idle_timeout parameter is deprecated. Please use \
database_connection_recycle_time instead.')
}
# NOTE(spredzy): In order to keep backward compatibility we rely on the pick function
# to use heat::<myparam> if heat::db::<myparam> isn't specified.
$database_connection_real = pick($::heat::database_connection, $database_connection)
$database_connection_recycle_time_real = pick($::heat::database_idle_timeout, $database_idle_timeout, $database_connection_recycle_time)
$database_connection_recycle_time_real = pick($::heat::database_idle_timeout, $database_connection_recycle_time)
$database_min_pool_size_real = pick($::heat::database_min_pool_size, $database_min_pool_size)
$database_max_pool_size_real = pick($::heat::database_max_pool_size, $database_max_pool_size)
$database_max_retries_real = pick($::heat::database_max_retries, $database_max_retries)

3
releasenotes/notes/remove_idle_timeout_option-bece49d2cb331cdf.yaml Normal file
View File

@ -0,0 +1,3 @@
---
upgrade:
- Deprecated idle_timeout option has been removed.