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

@@ -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,
   }
 }

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,
   }
 }

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.

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
 

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