From d6265c7b45f20148e78bcc4970b546ddc461ddd6 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: Ibfd781466e9786b1ddffa57784ab818a88f92439
---
 manifests/db.pp                                  | 16 +---------------
 ...ove_idle_timeout_option-a54add3b2551cc53.yaml |  3 +++
 2 files changed, 4 insertions(+), 15 deletions(-)
 create mode 100644 releasenotes/notes/remove_idle_timeout_option-a54add3b2551cc53.yaml

diff --git a/manifests/db.pp b/manifests/db.pp
index 09ca61d7..54d55f0d 100644
--- a/manifests/db.pp
+++ b/manifests/db.pp
@@ -48,12 +48,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 ceilometer::db (
   $database_db_max_retries          = $::os_service_default,
   $database_connection              = 'mysql+pymysql://ceilometer:ceilometer@localhost/ceilometer',
@@ -65,22 +59,14 @@ class ceilometer::db (
   $database_max_overflow            = $::os_service_default,
   $database_pool_timeout            = $::os_service_default,
   $sync_db                          = true,
-  # DEPRECATED PARAMETERS
-  $database_idle_timeout            = undef,
 ) {
 
   include ceilometer::deps
 
-  if $database_idle_timeout {
-    warning('The database_idle_timeout parameter is deprecated. Please use \
-database_connection_recycle_time instead.')
-  }
-  $database_connection_recycle_time_real = pick($database_idle_timeout, $database_connection_recycle_time)
-
   oslo::db { 'ceilometer_config':
     db_max_retries          => $database_db_max_retries,
     connection              => $database_connection,
-    connection_recycle_time => $database_connection_recycle_time_real,
+    connection_recycle_time => $database_connection_recycle_time,
     min_pool_size           => $database_min_pool_size,
     max_retries             => $database_max_retries,
     retry_interval          => $database_retry_interval,
diff --git a/releasenotes/notes/remove_idle_timeout_option-a54add3b2551cc53.yaml b/releasenotes/notes/remove_idle_timeout_option-a54add3b2551cc53.yaml
new file mode 100644
index 00000000..6ba54d41
--- /dev/null
+++ b/releasenotes/notes/remove_idle_timeout_option-a54add3b2551cc53.yaml
@@ -0,0 +1,3 @@
+---
+upgrade:
+  - Deprecated idle_timeout option has been removed.