From f46f1cd07002c5e85bf069103741baf14b151966 Mon Sep 17 00:00:00 2001
From: ZhongShengping <chdzsp@163.com>
Date: Thu, 22 Mar 2018 11:09:50 +0800
Subject: [PATCH] Add pool_timeout option

Add pool_timeout option to configure this value for pool_timeout with
SQLAlchemy.

Change-Id: Ib61344b3def10e3fc0ffb1b6b372ee19e2dc7dcb
Closes-Bug: #1757581
---
 manifests/db.pp                                             | 6 ++++++
 .../add-pool_timeout-option-for-db-831ff90d2497a2a7.yaml    | 5 +++++
 spec/classes/sahara_db_spec.rb                              | 3 +++
 3 files changed, 14 insertions(+)
 create mode 100644 releasenotes/notes/add-pool_timeout-option-for-db-831ff90d2497a2a7.yaml

diff --git a/manifests/db.pp b/manifests/db.pp
index a2a13b9c..b42a178f 100644
--- a/manifests/db.pp
+++ b/manifests/db.pp
@@ -38,6 +38,10 @@
 #   (optional) If set, use this value for max_overflow with sqlalchemy.
 #   Defaults to $::os_service_default.
 #
+# [*database_pool_timeout*]
+#   (Optional) If set, use this value for pool_timeout with SQLAlchemy.
+#   Defaults to $::os_service_default
+#
 class sahara::db (
   $database_db_max_retries = $::os_service_default,
   $database_connection     = 'mysql+pymysql://sahara:secrete@localhost:3306/sahara',
@@ -47,6 +51,7 @@ class sahara::db (
   $database_max_retries    = $::os_service_default,
   $database_retry_interval = $::os_service_default,
   $database_max_overflow   = $::os_service_default,
+  $database_pool_timeout   = $::os_service_default,
 ) {
 
   include ::sahara::deps
@@ -73,5 +78,6 @@ class sahara::db (
     max_retries    => $database_max_retries_real,
     retry_interval => $database_retry_interval_real,
     max_overflow   => $database_max_overflow_real,
+    pool_timeout   => $database_pool_timeout,
   }
 }
diff --git a/releasenotes/notes/add-pool_timeout-option-for-db-831ff90d2497a2a7.yaml b/releasenotes/notes/add-pool_timeout-option-for-db-831ff90d2497a2a7.yaml
new file mode 100644
index 00000000..be303891
--- /dev/null
+++ b/releasenotes/notes/add-pool_timeout-option-for-db-831ff90d2497a2a7.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    Adds the pool_timeout option for configuring oslo.db. This will
+    configure this value for pool_timeout with SQLAlchemy.
diff --git a/spec/classes/sahara_db_spec.rb b/spec/classes/sahara_db_spec.rb
index 6a7f2d07..cc577db4 100644
--- a/spec/classes/sahara_db_spec.rb
+++ b/spec/classes/sahara_db_spec.rb
@@ -13,6 +13,7 @@ describe 'sahara::db' do
         :max_retries    => '<SERVICE DEFAULT>',
         :retry_interval => '<SERVICE DEFAULT>',
         :max_overflow   => '<SERVICE DEFAULT>',
+        :pool_timeout   => '<SERVICE DEFAULT>',
       )}
     end
 
@@ -26,6 +27,7 @@ describe 'sahara::db' do
           :database_retry_interval => '11',
           :database_max_pool_size  => '11',
           :database_max_overflow   => '21',
+          :database_pool_timeout   => '21',
         }
       end
 
@@ -38,6 +40,7 @@ describe 'sahara::db' do
         :max_retries    => '11',
         :retry_interval => '11',
         :max_overflow   => '21',
+        :pool_timeout   => '21',
       )}
     end