From 8c8263117df48c993003fcba2df127db35fcdf02 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: I58760e6cfee299c6d5aef48810484a59b03003ca
Closes-Bug: #1757581
---
 manifests/db.pp                                             | 6 ++++++
 .../add-pool_timeout-option-for-db-9ba34699d922a1fe.yaml    | 5 +++++
 spec/classes/ec2api_db_spec.rb                              | 3 +++
 3 files changed, 14 insertions(+)
 create mode 100644 releasenotes/notes/add-pool_timeout-option-for-db-9ba34699d922a1fe.yaml

diff --git a/manifests/db.pp b/manifests/db.pp
index faaa0e5..0601e6b 100644
--- a/manifests/db.pp
+++ b/manifests/db.pp
@@ -38,6 +38,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
+#
 class ec2api::db (
   $database_connection     = 'sqlite:////var/lib/ec2api/ec2api.sqlite',
   $database_idle_timeout   = $::os_service_default,
@@ -47,6 +51,7 @@ class ec2api::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 ::ec2api::deps
@@ -62,6 +67,7 @@ class ec2api::db (
     retry_interval => $database_retry_interval,
     max_pool_size  => $database_max_pool_size,
     max_overflow   => $database_max_overflow,
+    pool_timeout   => $database_pool_timeout,
   }
 
 }
diff --git a/releasenotes/notes/add-pool_timeout-option-for-db-9ba34699d922a1fe.yaml b/releasenotes/notes/add-pool_timeout-option-for-db-9ba34699d922a1fe.yaml
new file mode 100644
index 0000000..be30389
--- /dev/null
+++ b/releasenotes/notes/add-pool_timeout-option-for-db-9ba34699d922a1fe.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/ec2api_db_spec.rb b/spec/classes/ec2api_db_spec.rb
index c26aadd..8e69523 100644
--- a/spec/classes/ec2api_db_spec.rb
+++ b/spec/classes/ec2api_db_spec.rb
@@ -20,6 +20,7 @@ describe 'ec2api::db' do
             :retry_interval => '<SERVICE DEFAULT>',
             :max_pool_size  => '<SERVICE DEFAULT>',
             :max_overflow   => '<SERVICE DEFAULT>',
+            :pool_timeout   => '<SERVICE DEFAULT>',
         }
 
         it { is_expected.to contain_oslo__db('ec2api_config').with(parameters) }
@@ -36,6 +37,7 @@ describe 'ec2api::db' do
               :database_retry_interval => '4',
               :database_max_pool_size  => '5',
               :database_max_overflow   => '6',
+              :database_pool_timeout   => '6',
           }
         end
 
@@ -52,6 +54,7 @@ describe 'ec2api::db' do
             :retry_interval => '4',
             :max_pool_size  => '5',
             :max_overflow   => '6',
+            :pool_timeout   => '6',
         }
 
         it { is_expected.to contain_oslo__db('ec2api_config').with(parameters) }