diff --git a/manifests/db.pp b/manifests/db.pp
index 64ca7f6..f584ca3 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.
@@ -46,6 +50,7 @@ class mistral::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,
 ) {
 
@@ -72,6 +77,7 @@ class mistral::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-ad535206b8ecf55d.yaml b/releasenotes/notes/add-pool_timeout-option-for-db-ad535206b8ecf55d.yaml
new file mode 100644
index 0000000..be30389
--- /dev/null
+++ b/releasenotes/notes/add-pool_timeout-option-for-db-ad535206b8ecf55d.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/mistral_db_spec.rb b/spec/classes/mistral_db_spec.rb
index 246ed32..8375959 100644
--- a/spec/classes/mistral_db_spec.rb
+++ b/spec/classes/mistral_db_spec.rb
@@ -15,6 +15,7 @@ describe 'mistral::db' do
         :max_retries    => '<SERVICE DEFAULT>',
         :retry_interval => '<SERVICE DEFAULT>',
         :max_overflow   => '<SERVICE DEFAULT>',
+        :pool_timeout   => '<SERVICE DEFAULT>',
       )}
 
     end
@@ -29,6 +30,7 @@ describe 'mistral::db' do
           :database_retry_interval => '11', 
           :database_db_max_retries => '-1',
           :database_max_overflow   => '21', 
+          :database_pool_timeout   => '21', 
         }
       end
 
@@ -41,6 +43,7 @@ describe 'mistral::db' do
         :max_retries    => '11',
         :retry_interval => '11',
         :max_overflow   => '21',
+        :pool_timeout   => '21',
       )}
     end