From 7b4078bdd9e65f1c030a1f285a27044f3976023c 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: I724f0b24b6f7ffb846f8bdf44156dcebeeaa7cae
Closes-Bug: #1757581
---
 manifests/api/db.pp                                         | 6 ++++++
 manifests/registry/db.pp                                    | 6 ++++++
 .../add-pool_timeout-option-for-db-81299f15988c59ba.yaml    | 5 +++++
 spec/classes/glance_api_db_spec.rb                          | 3 +++
 spec/classes/glance_registry_db_spec.rb                     | 3 +++
 5 files changed, 23 insertions(+)
 create mode 100644 releasenotes/notes/add-pool_timeout-option-for-db-81299f15988c59ba.yaml

diff --git a/manifests/api/db.pp b/manifests/api/db.pp
index c7b5296e..70022ad1 100644
--- a/manifests/api/db.pp
+++ b/manifests/api/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 glance::api::db (
   $database_db_max_retries = $::os_service_default,
   $database_connection     = 'sqlite:///var/lib/glance/glance.sqlite',
@@ -47,6 +51,7 @@ class glance::api::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 ::glance::deps
@@ -73,5 +78,6 @@ class glance::api::db (
     retry_interval => $database_retry_interval_real,
     max_pool_size  => $database_max_pool_size_real,
     max_overflow   => $database_max_overflow_real,
+    pool_timeout   => $database_pool_timeout,
   }
 }
diff --git a/manifests/registry/db.pp b/manifests/registry/db.pp
index 14cee101..cc18d000 100644
--- a/manifests/registry/db.pp
+++ b/manifests/registry/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 glance::registry::db (
   $database_db_max_retries = $::os_service_default,
   $database_connection     = 'sqlite:///var/lib/glance/glance.sqlite',
@@ -47,6 +51,7 @@ class glance::registry::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 ::glance::deps
@@ -73,5 +78,6 @@ class glance::registry::db (
     retry_interval => $database_retry_interval_real,
     max_pool_size  => $database_max_pool_size_real,
     max_overflow   => $database_max_overflow_real,
+    pool_timeout   => $database_pool_timeout,
   }
 }
diff --git a/releasenotes/notes/add-pool_timeout-option-for-db-81299f15988c59ba.yaml b/releasenotes/notes/add-pool_timeout-option-for-db-81299f15988c59ba.yaml
new file mode 100644
index 00000000..be303891
--- /dev/null
+++ b/releasenotes/notes/add-pool_timeout-option-for-db-81299f15988c59ba.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/glance_api_db_spec.rb b/spec/classes/glance_api_db_spec.rb
index 529221bb..ef8782c2 100644
--- a/spec/classes/glance_api_db_spec.rb
+++ b/spec/classes/glance_api_db_spec.rb
@@ -13,6 +13,7 @@ describe 'glance::api::db' do
         :max_retries    => '<SERVICE DEFAULT>',
         :retry_interval => '<SERVICE DEFAULT>',
         :max_overflow   => '<SERVICE DEFAULT>',
+        :pool_timeout   => '<SERVICE DEFAULT>',
       )}
     end
 
@@ -26,6 +27,7 @@ describe 'glance::api::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 'glance::api::db' do
         :db_max_retries => '-1',
         :retry_interval => '11',
         :max_overflow   => '21',
+        :pool_timeout   => '21',
       )}
     end
 
diff --git a/spec/classes/glance_registry_db_spec.rb b/spec/classes/glance_registry_db_spec.rb
index 20c9760e..e3ff217f 100644
--- a/spec/classes/glance_registry_db_spec.rb
+++ b/spec/classes/glance_registry_db_spec.rb
@@ -13,6 +13,7 @@ describe 'glance::registry::db' do
         :max_retries    => '<SERVICE DEFAULT>',
         :retry_interval => '<SERVICE DEFAULT>',
         :max_overflow   => '<SERVICE DEFAULT>',
+        :pool_timeout   => '<SERVICE DEFAULT>',
       )}
     end
 
@@ -26,6 +27,7 @@ describe 'glance::registry::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 'glance::registry::db' do
         :max_retries    => '11',
         :retry_interval => '11',
         :max_overflow   => '21',
+        :pool_timeout   => '21',
       )}
     end