openstack/puppet-aodh
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: I9ad1053949a98eeafec8a8640cf872855111a934
This commit is contained in:
ZhongShengping 2020-03-23 14:45:48 +08:00
parent dabda38321
commit 030de21192
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
manifests/db.pp
View File

@ -46,12 +46,6 @@
# (Optional) If set, use this value for pool_timeout with SQLAlchemy.
# Defaults to $::os_service_default
#
# DEPRECATED PARAMETERS
#
# [*database_idle_timeout*]
# Timeout when db connections should be reaped.
# Defaults to undef.
#
class aodh::db (
$database_db_max_retries = $::os_service_default,
$database_connection = 'sqlite:////var/lib/aodh/aodh.sqlite',
@ -63,17 +57,10 @@ class aodh::db (
$database_retry_interval = $::os_service_default,
$database_max_overflow = $::os_service_default,
$database_pool_timeout = $::os_service_default,
# DEPRECATED PARAMETERS
$database_idle_timeout = undef,
) {
include aodh::deps
if $database_idle_timeout {
warning('The database_idle_timeout parameter is deprecated. Please use \
database_connection_recycle_time instead.')
}
$database_connection_real = pick($::aodh::database_connection, $database_connection)
$slave_connection_real = pick($::aodh::slave_connection, $slave_connection)
$database_min_pool_size_real = pick($::aodh::database_min_pool_size, $database_min_pool_size)
@ -81,7 +68,7 @@ database_connection_recycle_time instead.')
$database_max_retries_real = pick($::aodh::database_max_retries, $database_max_retries)
$database_retry_interval_real = pick($::aodh::database_retry_interval, $database_retry_interval)
$database_max_overflow_real = pick($::aodh::database_max_overflow, $database_max_overflow)
$database_connection_recycle_time_real = pick($::aodh::database_idle_timeout, $database_idle_timeout, $database_connection_recycle_time)
$database_connection_recycle_time_real = pick($::aodh::database_idle_timeout, $database_connection_recycle_time)
oslo::db { 'aodh_config':
db_max_retries => $database_db_max_retries,

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

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