From 8bc7a0a6ee9e7ca8c87325e4e3b796f90deea409 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: If31c73dbedf622ddfb51aca53e9c0b42d97c0f72
---
 manifests/db.pp                                      | 12 +-----------
 .../remove_idle_timeout_option-9fc95800c716b5ee.yaml |  3 +++
 2 files changed, 4 insertions(+), 11 deletions(-)
 create mode 100644 releasenotes/notes/remove_idle_timeout_option-9fc95800c716b5ee.yaml

diff --git a/manifests/db.pp b/manifests/db.pp
index 970e7d7ba..984c8aa48 100644
--- a/manifests/db.pp
+++ b/manifests/db.pp
@@ -40,10 +40,6 @@
 #
 # DEPRECATED PARAMETERS
 #
-# [*database_idle_timeout*]
-#   Timeout when db connections should be reaped.
-#   Defaults to undef.
-#
 # [*database_min_pool_size*]
 #   Minimum number of SQL connections to keep open in a pool.
 #   (Optional) Defaults to undef.
@@ -58,17 +54,11 @@ class neutron::db (
   $database_pool_timeout            = $::os_service_default,
   $database_db_max_retries          = $::os_service_default,
   # DEPRECATED PARAMETERS
-  $database_idle_timeout            = undef,
   $database_min_pool_size           = undef,
 ) {
 
   include neutron::deps
 
-  if $database_idle_timeout {
-    warning('The database_idle_timeout parameter is deprecated. Please use \
-database_connection_recycle_time instead.')
-  }
-
   if $::neutron::server::database_min_pool_size or $database_min_pool_size {
     warning('The database_min_pool_size parameter is deprecated, and will be removed in a future release.')
   }
@@ -76,7 +66,7 @@ database_connection_recycle_time instead.')
   # NOTE(spredzy): In order to keep backward compatibility we rely on the pick function
   # to use neutron::<myparam> if neutron::db::<myparam> isn't specified.
   $database_connection_real = pick($::neutron::server::database_connection, $database_connection)
-  $database_connection_recycle_time_real = pick($::neutron::server::database_idle_timeout, $database_idle_timeout,
+  $database_connection_recycle_time_real = pick($::neutron::server::database_idle_timeout,
                                                 $database_connection_recycle_time)
   $database_max_pool_size_real = pick($::neutron::server::database_max_pool_size, $database_max_pool_size)
   $database_max_retries_real = pick($::neutron::server::database_max_retries, $database_max_retries)
diff --git a/releasenotes/notes/remove_idle_timeout_option-9fc95800c716b5ee.yaml b/releasenotes/notes/remove_idle_timeout_option-9fc95800c716b5ee.yaml
new file mode 100644
index 000000000..6ba54d415
--- /dev/null
+++ b/releasenotes/notes/remove_idle_timeout_option-9fc95800c716b5ee.yaml
@@ -0,0 +1,3 @@
+---
+upgrade:
+  - Deprecated idle_timeout option has been removed.