diff --git a/manifests/db.pp b/manifests/db.pp
index c747f223..786a0c98 100644
--- a/manifests/db.pp
+++ b/manifests/db.pp
@@ -8,7 +8,7 @@
 #   (Optional) Url used to connect to database.
 #   Defaults to 'sqlite:////var/lib/octavia/octavia.sqlite'.
 #
-# [*database_idle_timeout*]
+# [*database_connection_recycle_time*]
 #   (Optional) Timeout when db connections should be reaped.
 #   Defaults to $::os_service_default
 #
@@ -42,22 +42,36 @@
 #   before error is raised. Set to -1 to specify an infinite retry count.
 #   Defaults to $::os_service_default
 #
+# DEPRECATED PARAMETERS
+#
+# [*database_idle_timeout*]
+#   Timeout when db connections should be reaped.
+#   Defaults to undef.
+#
 class octavia::db (
-  $database_connection     = 'sqlite:////var/lib/octavia/octavia.sqlite',
-  $database_idle_timeout   = $::os_service_default,
-  $database_min_pool_size  = $::os_service_default,
-  $database_max_pool_size  = $::os_service_default,
-  $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,
+  $database_connection              = 'sqlite:////var/lib/octavia/octavia.sqlite',
+  $database_connection_recycle_time = $::os_service_default,
+  $database_min_pool_size           = $::os_service_default,
+  $database_max_pool_size           = $::os_service_default,
+  $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,
+  # DEPRECATED PARAMETERS
+  $database_idle_timeout            = undef,
 ) {
 
   include ::octavia::deps
 
+  if $database_idle_timeout {
+    warning('The database_idle_timeout parameter is deprecated. Please use \
+database_connection_recycle_time instead.')
+  }
+
   $database_connection_real = pick($::octavia::database_connection, $database_connection)
-  $database_idle_timeout_real = pick($::octavia::database_idle_timeout, $database_idle_timeout)
+  $database_connection_recycle_time_real = pick($::octavia::database_idle_timeout, $database_idle_timeout,
+                                                $database_connection_recycle_time)
   $database_min_pool_size_real = pick($::octavia::database_min_pool_size, $database_min_pool_size)
   $database_max_pool_size_real = pick($::octavia::database_max_pool_size, $database_max_pool_size)
   $database_max_retries_real = pick($::octavia::database_max_retries, $database_max_retries)
@@ -70,15 +84,15 @@ class octavia::db (
     ['^(sqlite|mysql(\+pymysql)?|postgresql):\/\/(\S+:\S+@\S+\/\S+)?'])
 
   oslo::db { 'octavia_config':
-    connection     => $database_connection_real,
-    idle_timeout   => $database_idle_timeout_real,
-    min_pool_size  => $database_min_pool_size_real,
-    max_pool_size  => $database_max_pool_size_real,
-    max_retries    => $database_max_retries_real,
-    retry_interval => $database_retry_interval_real,
-    max_overflow   => $database_max_overflow_real,
-    pool_timeout   => $database_pool_timeout_real,
-    db_max_retries => $database_db_max_retries_real,
+    connection              => $database_connection_real,
+    connection_recycle_time => $database_connection_recycle_time_real,
+    min_pool_size           => $database_min_pool_size_real,
+    max_pool_size           => $database_max_pool_size_real,
+    max_retries             => $database_max_retries_real,
+    retry_interval          => $database_retry_interval_real,
+    max_overflow            => $database_max_overflow_real,
+    pool_timeout            => $database_pool_timeout_real,
+    db_max_retries          => $database_db_max_retries_real,
   }
 
 }
diff --git a/releasenotes/notes/deprecate_idle_timeout_parameter-91484626097ef011.yaml b/releasenotes/notes/deprecate_idle_timeout_parameter-91484626097ef011.yaml
new file mode 100644
index 00000000..09e76c41
--- /dev/null
+++ b/releasenotes/notes/deprecate_idle_timeout_parameter-91484626097ef011.yaml
@@ -0,0 +1,4 @@
+---
+deprecations:
+  - database_idle_timeout is deprecated and will be removed in a future
+    release. Please use database_connection_recycle_time instead.
diff --git a/spec/classes/octavia_db_spec.rb b/spec/classes/octavia_db_spec.rb
index e36fc3c2..5113258d 100644
--- a/spec/classes/octavia_db_spec.rb
+++ b/spec/classes/octavia_db_spec.rb
@@ -4,43 +4,43 @@ describe 'octavia::db' do
   shared_examples 'octavia::db' do
     context 'with default parameters' do
       it { should contain_oslo__db('octavia_config').with(
-        :db_max_retries => '<SERVICE DEFAULT>',
-        :connection     => 'sqlite:////var/lib/octavia/octavia.sqlite',
-        :idle_timeout   => '<SERVICE DEFAULT>',
-        :min_pool_size  => '<SERVICE DEFAULT>',
-        :max_pool_size  => '<SERVICE DEFAULT>',
-        :max_retries    => '<SERVICE DEFAULT>',
-        :retry_interval => '<SERVICE DEFAULT>',
-        :max_overflow   => '<SERVICE DEFAULT>',
-        :pool_timeout   => '<SERVICE DEFAULT>',
+        :db_max_retries          => '<SERVICE DEFAULT>',
+        :connection              => 'sqlite:////var/lib/octavia/octavia.sqlite',
+        :connection_recycle_time => '<SERVICE DEFAULT>',
+        :min_pool_size           => '<SERVICE DEFAULT>',
+        :max_pool_size           => '<SERVICE DEFAULT>',
+        :max_retries             => '<SERVICE DEFAULT>',
+        :retry_interval          => '<SERVICE DEFAULT>',
+        :max_overflow            => '<SERVICE DEFAULT>',
+        :pool_timeout            => '<SERVICE DEFAULT>',
       )}
     end
 
     context 'with specific parameters' do
       let :params do
         {
-          :database_connection     => 'mysql+pymysql://octavia:octavia@localhost/octavia',
-          :database_idle_timeout   => '3601',
-          :database_min_pool_size  => '2',
-          :database_max_retries    => '11',
-          :database_retry_interval => '11',
-          :database_max_pool_size  => '11',
-          :database_max_overflow   => '21',
-          :database_pool_timeout   => '21',
-          :database_db_max_retries => '-1',
+          :database_connection              => 'mysql+pymysql://octavia:octavia@localhost/octavia',
+          :database_connection_recycle_time => '3601',
+          :database_min_pool_size           => '2',
+          :database_max_retries             => '11',
+          :database_retry_interval          => '11',
+          :database_max_pool_size           => '11',
+          :database_max_overflow            => '21',
+          :database_pool_timeout            => '21',
+          :database_db_max_retries          => '-1',
         }
       end
 
       it { should contain_oslo__db('octavia_config').with(
-        :db_max_retries => '-1',
-        :connection     => 'mysql+pymysql://octavia:octavia@localhost/octavia',
-        :idle_timeout   => '3601',
-        :min_pool_size  => '2',
-        :max_pool_size  => '11',
-        :max_retries    => '11',
-        :retry_interval => '11',
-        :max_overflow   => '21',
-        :pool_timeout   => '21',
+        :db_max_retries          => '-1',
+        :connection              => 'mysql+pymysql://octavia:octavia@localhost/octavia',
+        :connection_recycle_time => '3601',
+        :min_pool_size           => '2',
+        :max_pool_size           => '11',
+        :max_retries             => '11',
+        :retry_interval          => '11',
+        :max_overflow            => '21',
+        :pool_timeout            => '21',
       )}
     end
   end