Merge "Add pool_timeout option"

openstack · Mar 27, 2018 · 95b91f4 · 95b91f4
2 parents 6768a28 + 7b4078b
commit 95b91f4
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 0 deletions.
diff --git 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 @@
   $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 @@
     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
@@ -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 @@
   $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 @@
     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
@@ -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
@@ -13,6 +13,7 @@
         :max_retries    => '<SERVICE DEFAULT>',
         :retry_interval => '<SERVICE DEFAULT>',
         :max_overflow   => '<SERVICE DEFAULT>',
+        :pool_timeout   => '<SERVICE DEFAULT>',
       )}
     end
 
@@ -26,6 +27,7 @@
           :database_retry_interval => '11',
           :database_max_pool_size  => '11',
           :database_max_overflow   => '21',
+          :database_pool_timeout   => '21',
         }
       end
 
@@ -38,6 +40,7 @@
         :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
@@ -13,6 +13,7 @@
         :max_retries    => '<SERVICE DEFAULT>',
         :retry_interval => '<SERVICE DEFAULT>',
         :max_overflow   => '<SERVICE DEFAULT>',
+        :pool_timeout   => '<SERVICE DEFAULT>',
       )}
     end
 
@@ -26,6 +27,7 @@
           :database_retry_interval => '11',
           :database_max_pool_size  => '11',
           :database_max_overflow   => '21',
+          :database_pool_timeout   => '21',
         }
       end
 
@@ -38,6 +40,7 @@
         :max_retries    => '11',
         :retry_interval => '11',
         :max_overflow   => '21',
+        :pool_timeout   => '21',
       )}
     end