From 16d279e21e66b842d58a05a138ee9a4c48688f59 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: Iaed980290c707463652c36928ec24f603301a183
---
 manifests/api/db.pp                               | 15 +--------------
 manifests/registry/db.pp                          | 15 +--------------
 ...move_idle_timeout_option-aaf1a514540694b2.yaml |  3 +++
 3 files changed, 5 insertions(+), 28 deletions(-)
 create mode 100644 releasenotes/notes/remove_idle_timeout_option-aaf1a514540694b2.yaml

diff --git a/manifests/api/db.pp b/manifests/api/db.pp
index 4181f107..018e79bb 100644
--- a/manifests/api/db.pp
+++ b/manifests/api/db.pp
@@ -42,12 +42,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 glance::api::db (
   $database_db_max_retries          = $::os_service_default,
   $database_connection              = 'sqlite:///var/lib/glance/glance.sqlite',
@@ -58,21 +52,14 @@ class glance::api::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 glance::deps
 
-  if $database_idle_timeout {
-    warning('The database_idle_timeout parameter is deprecated. Please use \
-database_connection_recycle_time instead.')
-  }
-
   # NOTE(degorenko): In order to keep backward compatibility we rely on the pick function
   # to use glance::api::<myparam> if glance::api::db::<myparam> isn't specified.
   $database_connection_real              = pick($::glance::api::database_connection, $database_connection)
-  $database_connection_recycle_time_real = pick($::glance::api::database_idle_timeout, $database_idle_timeout,
+  $database_connection_recycle_time_real = pick($::glance::api::database_idle_timeout,
                                                 $database_connection_recycle_time)
   $database_min_pool_size_real           = pick($::glance::api::database_min_pool_size, $database_min_pool_size)
   $database_max_pool_size_real           = pick($::glance::api::database_max_pool_size, $database_max_pool_size)
diff --git a/manifests/registry/db.pp b/manifests/registry/db.pp
index d509e02e..6f9f824c 100644
--- a/manifests/registry/db.pp
+++ b/manifests/registry/db.pp
@@ -42,12 +42,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 glance::registry::db (
   $database_db_max_retries          = $::os_service_default,
   $database_connection              = 'sqlite:///var/lib/glance/glance.sqlite',
@@ -58,21 +52,14 @@ class glance::registry::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 glance::deps
 
-  if $database_idle_timeout {
-    warning('The database_idle_timeout parameter is deprecated. Please use \
-database_connection_recycle_time instead.')
-  }
-
   # NOTE(degorenko): In order to keep backward compatibility we rely on the pick function
   # to use glance::registry::<myparam> if glance::registry::db::<myparam> isn't specified.
   $database_connection_real              = pick($::glance::registry::database_connection, $database_connection)
-  $database_connection_recycle_time_real = pick($::glance::registry::database_idle_timeout, $database_idle_timeout,
+  $database_connection_recycle_time_real = pick($::glance::registry::database_idle_timeout,
                                                 $database_connection_recycle_time)
   $database_min_pool_size_real           = pick($::glance::registry::database_min_pool_size, $database_min_pool_size)
   $database_max_pool_size_real           = pick($::glance::registry::database_max_pool_size, $database_max_pool_size)
diff --git a/releasenotes/notes/remove_idle_timeout_option-aaf1a514540694b2.yaml b/releasenotes/notes/remove_idle_timeout_option-aaf1a514540694b2.yaml
new file mode 100644
index 00000000..6ba54d41
--- /dev/null
+++ b/releasenotes/notes/remove_idle_timeout_option-aaf1a514540694b2.yaml
@@ -0,0 +1,3 @@
+---
+upgrade:
+  - Deprecated idle_timeout option has been removed.