From 309d4a6153646bf946a6420a586d9d5f11ae2f19 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: Id43266952a32346eb106890fd8aeb28840486e1a
Closes-Bug: #1757581
---
 manifests/db.pp                                             | 6 ++++++
 .../add-pool_timeout-option-for-db-931acdebaa940b48.yaml    | 5 +++++
 spec/classes/manila_db_spec.rb                              | 3 +++
 3 files changed, 14 insertions(+)
 create mode 100644 releasenotes/notes/add-pool_timeout-option-for-db-931acdebaa940b48.yaml

diff --git a/manifests/db.pp b/manifests/db.pp
index ac19c550..00536f10 100644
--- a/manifests/db.pp
+++ b/manifests/db.pp
@@ -33,6 +33,10 @@
 #   If set, use this value for max_overflow with sqlalchemy.
 #   (Optional) Defaults to $::os_service_default
 #
+# [*database_pool_timeout*]
+#   (Optional) If set, use this value for pool_timeout with SQLAlchemy.
+#   Defaults to $::os_service_default
+#
 # [*database_db_max_retries*]
 #   (optional) Maximum retries in case of connection error or deadlock error
 #   before error is raised. Set to -1 to specify an infinite retry count.
@@ -46,6 +50,7 @@ class manila::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,
   $database_db_max_retries = $::os_service_default,
 ) {
 
@@ -72,6 +77,7 @@ class manila::db (
     max_retries    => $database_max_retries_real,
     retry_interval => $database_retry_interval_real,
     max_overflow   => $database_max_overflow_real,
+    pool_timeout   => $database_pool_timeout,
     db_max_retries => $database_db_max_retries,
   }
 }
diff --git a/releasenotes/notes/add-pool_timeout-option-for-db-931acdebaa940b48.yaml b/releasenotes/notes/add-pool_timeout-option-for-db-931acdebaa940b48.yaml
new file mode 100644
index 00000000..be303891
--- /dev/null
+++ b/releasenotes/notes/add-pool_timeout-option-for-db-931acdebaa940b48.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/manila_db_spec.rb b/spec/classes/manila_db_spec.rb
index 55c4a86f..0c305917 100644
--- a/spec/classes/manila_db_spec.rb
+++ b/spec/classes/manila_db_spec.rb
@@ -15,6 +15,7 @@ describe 'manila::db' do
         :max_retries    => '<SERVICE DEFAULT>',
         :retry_interval => '<SERVICE DEFAULT>',
         :max_overflow   => '<SERVICE DEFAULT>',
+        :pool_timeout   => '<SERVICE DEFAULT>',
       )}
 
     end
@@ -27,6 +28,7 @@ describe 'manila::db' do
           :database_max_pool_size  => '21',
           :database_max_retries    => '11',
           :database_max_overflow   => '21',
+          :database_pool_timeout   => '21',
           :database_retry_interval => '11',
           :database_db_max_retries => '-1', }
       end
@@ -40,6 +42,7 @@ describe 'manila::db' do
         :max_retries    => '11',
         :retry_interval => '11',
         :max_overflow   => '21',
+        :pool_timeout   => '21',
       )}
 
     end