From d0720953c23d70bb750f7336cd29434b15ca1d18 Mon Sep 17 00:00:00 2001
From: Sahid Orentino Ferdjaoui <sahid.ferdjaoui@canonical.com>
Date: Wed, 28 Nov 2018 10:05:01 +0100
Subject: [PATCH] remove idle_timeout's opt in favor of connection_recycle_time

In icehouse database/idle_timeout has been deprecated in favor to
database/connection_recycle_time. This commit reflects the change in
our templates.

Change-Id: I6814a9d61d24c713e7a5182bf9683a393cda06bb
Closes-Bug: 1805592
Signed-off-by: Sahid Orentino Ferdjaoui <sahid.ferdjaoui@canonical.com>
---
 templates/icehouse/keystone.conf | 2 +-
 templates/kilo/keystone.conf     | 2 +-
 templates/mitaka/keystone.conf   | 2 +-
 templates/ocata/keystone.conf    | 2 +-
 templates/rocky/keystone.conf    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/templates/icehouse/keystone.conf b/templates/icehouse/keystone.conf
index 330afef2..9f071c4f 100644
--- a/templates/icehouse/keystone.conf
+++ b/templates/icehouse/keystone.conf
@@ -23,7 +23,7 @@ connection = {{ database_type }}://{{ database_user }}:{{ database_password }}@{
 {% else -%}
 connection = sqlite:////var/lib/keystone/keystone.db
 {% endif -%}
-idle_timeout = 200
+connection_recycle_time = 200
 
 [identity]
 driver = keystone.identity.backends.{{ identity_backend }}.Identity
diff --git a/templates/kilo/keystone.conf b/templates/kilo/keystone.conf
index 08f6ea6a..0fe38cd7 100644
--- a/templates/kilo/keystone.conf
+++ b/templates/kilo/keystone.conf
@@ -26,7 +26,7 @@ connection = {{ database_type }}://{{ database_user }}:{{ database_password }}@{
 {% else -%}
 connection = sqlite:////var/lib/keystone/keystone.db
 {% endif -%}
-idle_timeout = 200
+connection_recycle_time = 200
 
 [identity]
 driver = keystone.identity.backends.{{ identity_backend }}.Identity
diff --git a/templates/mitaka/keystone.conf b/templates/mitaka/keystone.conf
index 9a837a3f..9ebd8692 100644
--- a/templates/mitaka/keystone.conf
+++ b/templates/mitaka/keystone.conf
@@ -17,7 +17,7 @@ connection = {{ database_type }}://{{ database_user }}:{{ database_password }}@{
 {% else -%}
 connection = sqlite:////var/lib/keystone/keystone.db
 {% endif -%}
-idle_timeout = 200
+connection_recycle_time = 200
 
 [identity]
 driver = {{ identity_backend }}
diff --git a/templates/ocata/keystone.conf b/templates/ocata/keystone.conf
index c84dc9d8..d9c2bd48 100644
--- a/templates/ocata/keystone.conf
+++ b/templates/ocata/keystone.conf
@@ -17,7 +17,7 @@ connection = {{ database_type }}://{{ database_user }}:{{ database_password }}@{
 {% else -%}
 connection = sqlite:////var/lib/keystone/keystone.db
 {% endif -%}
-idle_timeout = 200
+connection_recycle_time = 200
 
 [identity]
 driver = {{ identity_backend }}
diff --git a/templates/rocky/keystone.conf b/templates/rocky/keystone.conf
index 1072a558..8b202df1 100644
--- a/templates/rocky/keystone.conf
+++ b/templates/rocky/keystone.conf
@@ -17,7 +17,7 @@ connection = {{ database_type }}://{{ database_user }}:{{ database_password }}@{
 {% else -%}
 connection = sqlite:////var/lib/keystone/keystone.db
 {% endif -%}
-idle_timeout = 200
+connection_recycle_time = 200
 
 [identity]
 driver = {{ identity_backend }}