Deprecate idle_timeout option

The idle_timeout parameter is deprecated, use connection_recycle_time
instead[1].

[1]https://review.opendev.org/#/c/334182/

Change-Id: I9813fedbdeabdc0cda1e29ffe97214dec7795c94
Depends-On: https://review.opendev.org/656106/
Closes-Bug: #1826692

manifests/db.pp

@@ -8,7 +8,7 @@
 #   Url used to connect to database.
 #   (Optional) Defaults to 'sqlite:////var/lib/neutron/ovs.sqlite'.
 #
-# [*database_idle_timeout*]
+# [*database_connection_recycle_time*]
 #   Timeout when db connections should be reaped.
 #   (Optional) Defaults to $::os_service_default.
 #
@@ -42,9 +42,15 @@
 #   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 neutron::db (
   $database_connection              = 'sqlite:////var/lib/neutron/ovs.sqlite',
-  $database_idle_timeout   = $::os_service_default,
+  $database_connection_recycle_time = $::os_service_default,
   $database_min_pool_size           = $::os_service_default,
   $database_max_pool_size           = $::os_service_default,
   $database_max_retries             = $::os_service_default,
@@ -52,14 +58,22 @@ class neutron::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 ::neutron::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 neutron::<myparam> if neutron::db::<myparam> isn't specified.
   $database_connection_real = pick($::neutron::server::database_connection, $database_connection)
-  $database_idle_timeout_real = pick($::neutron::server::database_idle_timeout, $database_idle_timeout)
+  $database_connection_recycle_time_real = pick($::neutron::server::database_idle_timeout, $database_idle_timeout,
+                                                $database_connection_recycle_time)
   $database_min_pool_size_real = pick($::neutron::server::database_min_pool_size, $database_min_pool_size)
   $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)
@@ -73,7 +87,7 @@ class neutron::db (
 
     oslo::db { 'neutron_config':
       connection              => $database_connection_real,
-      idle_timeout   => $database_idle_timeout_real,
+      connection_recycle_time => $database_connection_recycle_time_real,
       min_pool_size           => $database_min_pool_size_real,
       max_retries             => $database_max_retries_real,
       retry_interval          => $database_retry_interval_real,

releasenotes/notes/deprecate_idle_timeout_parameter-8ea770612f1c9102.yaml

@@ -0,0 +1,4 @@
+---
+deprecations:
+  - database_idle_timeout is deprecated and will be removed in a future
+    release. Please use database_connection_recycle_time instead.

spec/classes/neutron_db_spec.rb

@@ -6,7 +6,7 @@ describe 'neutron::db' do
       it { should contain_oslo__db('neutron_config').with(
         :db_max_retries          => '<SERVICE DEFAULT>',
         :connection              => 'sqlite:////var/lib/neutron/ovs.sqlite',
-        :idle_timeout   => '<SERVICE DEFAULT>',
+        :connection_recycle_time => '<SERVICE DEFAULT>',
         :min_pool_size           => '<SERVICE DEFAULT>',
         :max_pool_size           => '<SERVICE DEFAULT>',
         :max_retries             => '<SERVICE DEFAULT>',
@@ -20,7 +20,7 @@ describe 'neutron::db' do
       let :params do
         {
           :database_connection              => 'mysql+pymysql://neutron:neutron@localhost/neutron',
-          :database_idle_timeout   => '3601',
+          :database_connection_recycle_time => '3601',
           :database_min_pool_size           => '2',
           :database_max_pool_size           => '11',
           :database_max_retries             => '11',
@@ -34,7 +34,7 @@ describe 'neutron::db' do
       it { should contain_oslo__db('neutron_config').with(
         :db_max_retries          => '-1',
         :connection              => 'mysql+pymysql://neutron:neutron@localhost/neutron',
-        :idle_timeout   => '3601',
+        :connection_recycle_time => '3601',
         :min_pool_size           => '2',
         :max_pool_size           => '11',
         :max_retries             => '11',