diff --git a/manifests/db.pp b/manifests/db.pp index f3ea817b..9739b087 100644 --- a/manifests/db.pp +++ b/manifests/db.pp @@ -42,12 +42,6 @@ # before error is raised. Set to -1 to specify an infinite retry count. # Defaults to $::os_service_default # -# DEPRECATED PARAMETERS -# -# [*database_idle_timeout*] -# Timeout when db connections should be reaped. -# Defaults to undef. -# class manila::db ( $database_connection = 'sqlite:////var/lib/manila/manila.sqlite', $database_connection_recycle_time = $::os_service_default, @@ -58,21 +52,14 @@ class manila::db ( $database_max_overflow = $::os_service_default, $database_pool_timeout = $::os_service_default, $database_db_max_retries = $::os_service_default, - # DEPRECATED PARAMETERS - $database_idle_timeout = undef, ) { include manila::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 manila:: if manila::db:: isn't specified. $database_connection_real = pick($::manila::sql_connection, $database_connection) - $database_connection_recycle_time_real = pick($::manila::sql_idle_timeout, $database_idle_timeout, $database_connection_recycle_time) + $database_connection_recycle_time_real = pick($::manila::sql_idle_timeout, $database_connection_recycle_time) $database_min_pool_size_real = pick($::manila::database_min_pool_size, $database_min_pool_size) $database_max_pool_size_real = pick($::manila::database_max_pool_size, $database_max_pool_size) $database_max_retries_real = pick($::manila::database_max_retries, $database_max_retries) diff --git a/releasenotes/notes/remove_idle_timeout_option-a5f6ec4a08f01a9b.yaml b/releasenotes/notes/remove_idle_timeout_option-a5f6ec4a08f01a9b.yaml new file mode 100644 index 00000000..6ba54d41 --- /dev/null +++ b/releasenotes/notes/remove_idle_timeout_option-a5f6ec4a08f01a9b.yaml @@ -0,0 +1,3 @@ +--- +upgrade: + - Deprecated idle_timeout option has been removed.