From 030de21192b2c6251233cb445023c8d52788da09 Mon Sep 17 00:00:00 2001
From: ZhongShengping <chdzsp@163.com>
Date: Mon, 23 Mar 2020 14:45:48 +0800
Subject: [PATCH] Remove idle_timeout option

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

Change-Id: I9ad1053949a98eeafec8a8640cf872855111a934
---
 manifests/db.pp                                   | 15 +--------------
 ...move_idle_timeout_option-bdf5664f03566db2.yaml |  3 +++
 2 files changed, 4 insertions(+), 14 deletions(-)
 create mode 100644 releasenotes/notes/remove_idle_timeout_option-bdf5664f03566db2.yaml

diff --git a/manifests/db.pp b/manifests/db.pp
index 40fd61b2..83926c6f 100644
--- a/manifests/db.pp
+++ b/manifests/db.pp
@@ -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,
diff --git a/releasenotes/notes/remove_idle_timeout_option-bdf5664f03566db2.yaml b/releasenotes/notes/remove_idle_timeout_option-bdf5664f03566db2.yaml
new file mode 100644
index 00000000..6ba54d41
--- /dev/null
+++ b/releasenotes/notes/remove_idle_timeout_option-bdf5664f03566db2.yaml
@@ -0,0 +1,3 @@
+---
+upgrade:
+  - Deprecated idle_timeout option has been removed.