openstack/puppet-octavia
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: I65977cf90f0944cfceaa0c97b12a547079e18871
This commit is contained in:
ZhongShengping 2020-03-23 14:45:49 +08:00
parent fe79fb1a5f
commit 4103b2dc82
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

@ -42,12 +42,6 @@
# before error is raised. Set to -1 to specify an infinite retry count. # before error is raised. Set to -1 to specify an infinite retry count.
# Defaults to $::os_service_default # Defaults to $::os_service_default
# #
# DEPRECATED PARAMETERS
#
# [*database_idle_timeout*]
# Timeout when db connections should be reaped.
# Defaults to undef.
#
class octavia::db ( class octavia::db (
$database_connection = 'sqlite:////var/lib/octavia/octavia.sqlite', $database_connection = 'sqlite:////var/lib/octavia/octavia.sqlite',
$database_connection_recycle_time = $::os_service_default, $database_connection_recycle_time = $::os_service_default,
@ -58,19 +52,12 @@ class octavia::db (
$database_max_overflow = $::os_service_default, $database_max_overflow = $::os_service_default,
$database_pool_timeout = $::os_service_default, $database_pool_timeout = $::os_service_default,
$database_db_max_retries = $::os_service_default, $database_db_max_retries = $::os_service_default,
# DEPRECATED PARAMETERS
$database_idle_timeout = undef,
) { ) {
include octavia::deps include octavia::deps
if $database_idle_timeout {
warning('The database_idle_timeout parameter is deprecated. Please use \
database_connection_recycle_time instead.')
}
$database_connection_real = pick($::octavia::database_connection, $database_connection) $database_connection_real = pick($::octavia::database_connection, $database_connection)
$database_connection_recycle_time_real = pick($::octavia::database_idle_timeout, $database_idle_timeout, $database_connection_recycle_time_real = pick($::octavia::database_idle_timeout,
$database_connection_recycle_time) $database_connection_recycle_time)
$database_min_pool_size_real = pick($::octavia::database_min_pool_size, $database_min_pool_size) $database_min_pool_size_real = pick($::octavia::database_min_pool_size, $database_min_pool_size)
$database_max_pool_size_real = pick($::octavia::database_max_pool_size, $database_max_pool_size) $database_max_pool_size_real = pick($::octavia::database_max_pool_size, $database_max_pool_size)

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

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