From 12e2f4a886f7a97d1f34bce22254ea114f829bbd Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Mon, 15 Feb 2021 09:44:09 +0900
Subject: [PATCH] Fix the wrong default value of idle_timeout

Currently we always get the following warnings because of the wrong
default value of idle_timeout.

The idle_timeout parameter is deprecated.
Please use connection_recycle_time instead.

This change fixes the default and ensures that the warning message
is shown only when the deprecated parameter is set.

Change-Id: Iba93ffdacf45096a6db65f3f0dfcfaf7d87574f2
---
 manifests/db.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/db.pp b/manifests/db.pp
index 3fcb191..fda4a7d 100644
--- a/manifests/db.pp
+++ b/manifests/db.pp
@@ -147,7 +147,7 @@ define oslo::db(
   $use_tpool               = $::os_service_default,
   $mysql_enable_ndb        = $::os_service_default,
   # DEPRCATED PARAMETERS
-  $idle_timeout            = $::os_service_default,
+  $idle_timeout            = undef,
   $min_pool_size           = undef,
 ) {
 
@@ -194,7 +194,7 @@ define oslo::db(
     }
   }
 
-  if $idle_timeout {
+  if $idle_timeout != undef {
     warning('The idle_timeout parameter is deprecated. Please use connection_recycle_time instead.')
   }