From 1f34a436dce17f2da830c169f2cd521a9c4851be 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: I96157ad65fb96dfe56bae9c92d0fd7f74b62df62
Closes-Bug: #1757581
---
 manifests/db.pp                                             | 6 ++++++
 .../add-pool_timeout-option-for-db-b86bd074bc517dbc.yaml    | 5 +++++
 spec/classes/heat_db_spec.rb                                | 3 +++
 3 files changed, 14 insertions(+)
 create mode 100644 releasenotes/notes/add-pool_timeout-option-for-db-b86bd074bc517dbc.yaml

diff --git a/manifests/db.pp b/manifests/db.pp
index a1378955..10722bde 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.
@@ -50,6 +54,7 @@ class heat::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,
   $sync_db                 = true,
 ) {
@@ -78,6 +83,7 @@ class heat::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-b86bd074bc517dbc.yaml b/releasenotes/notes/add-pool_timeout-option-for-db-b86bd074bc517dbc.yaml
new file mode 100644
index 00000000..be303891
--- /dev/null
+++ b/releasenotes/notes/add-pool_timeout-option-for-db-b86bd074bc517dbc.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/heat_db_spec.rb b/spec/classes/heat_db_spec.rb
index 45963fce..96c68d0d 100644
--- a/spec/classes/heat_db_spec.rb
+++ b/spec/classes/heat_db_spec.rb
@@ -16,6 +16,7 @@ describe 'heat::db' do
         :max_retries    => '<SERVICE DEFAULT>',
         :retry_interval => '<SERVICE DEFAULT>',
         :max_overflow   => '<SERVICE DEFAULT>',
+        :pool_timeout   => '<SERVICE DEFAULT>',
       )}
 
     end
@@ -30,6 +31,7 @@ describe 'heat::db' do
           :database_retry_interval => '11',
           :database_db_max_retries => '-1',
           :database_max_overflow   => '21',
+          :database_pool_timeout   => '21',
           :sync_db                 => false }
       end
 
@@ -43,6 +45,7 @@ describe 'heat::db' do
         :max_retries    => '11',
         :retry_interval => '11',
         :max_overflow   => '21',
+        :pool_timeout   => '21',
       )}
 
     end