diff --git a/manifests/db.pp b/manifests/db.pp
index 8583ad4..1fc5bbe 100644
--- a/manifests/db.pp
+++ b/manifests/db.pp
@@ -13,7 +13,7 @@
 #   Url used to connect to database.
 #   (Optional) Defaults to "sqlite:////var/lib/ec2api/ec2api.sqlite".
 #
-# [*database_idle_timeout*]
+# [*database_connection_recycle_time*]
 #   Timeout when db connections should be reaped.
 #   (Optional) Defaults to $::os_service_default
 #
@@ -42,16 +42,24 @@
 #   (Optional) If set, use this value for pool_timeout with SQLAlchemy.
 #   Defaults to $::os_service_default
 #
+# DEPRECATED PARAMETERS
+#
+# [*database_idle_timeout*]
+#   Timeout when db connections should be reaped.
+#   Defaults to undef.
+#
 class ec2api::db (
-  $database_connection     = 'sqlite:////var/lib/ec2api/ec2api.sqlite',
-  $database_idle_timeout   = $::os_service_default,
-  $database_min_pool_size  = $::os_service_default,
-  $database_max_pool_size  = $::os_service_default,
-  $database_db_max_retries = $::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_connection              = 'sqlite:////var/lib/ec2api/ec2api.sqlite',
+  $database_connection_recycle_time = $::os_service_default,
+  $database_min_pool_size           = $::os_service_default,
+  $database_max_pool_size           = $::os_service_default,
+  $database_db_max_retries          = $::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,
+  # DEPRECATED PARAMETERS
+  $database_idle_timeout            = undef,
 ) {
 
   include ::ec2api::deps
@@ -59,16 +67,22 @@ class ec2api::db (
   validate_legacy(Oslo::Dbconn, 'validate_re', $database_connection,
     ['^(sqlite|mysql(\+pymysql)?|postgresql):\/\/(\S+:\S+@\S+\/\S+)?'])
 
+  if $database_idle_timeout {
+    warning('The database_idle_timeout parameter is deprecated. Please use \
+database_connection_recycle_time instead.')
+  }
+  $database_connection_recycle_time_real = pick($database_idle_timeout, $database_connection_recycle_time)
+
   oslo::db { 'ec2api_config':
-    connection     => $database_connection,
-    idle_timeout   => $database_idle_timeout,
-    min_pool_size  => $database_min_pool_size,
-    db_max_retries => $database_db_max_retries,
-    max_retries    => $database_max_retries,
-    retry_interval => $database_retry_interval,
-    max_pool_size  => $database_max_pool_size,
-    max_overflow   => $database_max_overflow,
-    pool_timeout   => $database_pool_timeout,
+    connection              => $database_connection,
+    connection_recycle_time => $database_connection_recycle_time_real,
+    min_pool_size           => $database_min_pool_size,
+    db_max_retries          => $database_db_max_retries,
+    max_retries             => $database_max_retries,
+    retry_interval          => $database_retry_interval,
+    max_pool_size           => $database_max_pool_size,
+    max_overflow            => $database_max_overflow,
+    pool_timeout            => $database_pool_timeout,
   }
 
 }
diff --git a/releasenotes/notes/deprecate_idle_timeout_parameter-843bf248f6d17e32.yaml b/releasenotes/notes/deprecate_idle_timeout_parameter-843bf248f6d17e32.yaml
new file mode 100644
index 0000000..09e76c4
--- /dev/null
+++ b/releasenotes/notes/deprecate_idle_timeout_parameter-843bf248f6d17e32.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/ec2api_db_spec.rb b/spec/classes/ec2api_db_spec.rb
index 04efe2e..12b2ef0 100644
--- a/spec/classes/ec2api_db_spec.rb
+++ b/spec/classes/ec2api_db_spec.rb
@@ -6,45 +6,45 @@ describe 'ec2api::db' do
       it { should contain_class('ec2api::deps') }
 
       it { should contain_oslo__db('ec2api_config').with(
-        :connection     => 'sqlite:////var/lib/ec2api/ec2api.sqlite',
-        :idle_timeout   => '<SERVICE DEFAULT>',
-        :min_pool_size  => '<SERVICE DEFAULT>',
-        :db_max_retries => '<SERVICE DEFAULT>',
-        :max_retries    => '<SERVICE DEFAULT>',
-        :retry_interval => '<SERVICE DEFAULT>',
-        :max_pool_size  => '<SERVICE DEFAULT>',
-        :max_overflow   => '<SERVICE DEFAULT>',
-        :pool_timeout   => '<SERVICE DEFAULT>',
+        :connection              => 'sqlite:////var/lib/ec2api/ec2api.sqlite',
+        :connection_recycle_time => '<SERVICE DEFAULT>',
+        :min_pool_size           => '<SERVICE DEFAULT>',
+        :db_max_retries          => '<SERVICE DEFAULT>',
+        :max_retries             => '<SERVICE DEFAULT>',
+        :retry_interval          => '<SERVICE DEFAULT>',
+        :max_pool_size           => '<SERVICE DEFAULT>',
+        :max_overflow            => '<SERVICE DEFAULT>',
+        :pool_timeout            => '<SERVICE DEFAULT>',
       )}
     end
 
     context 'with specific parameters' do
       let :params do
         {
-          :database_connection     => 'sqlite:////path/to/my/db.sqlite',
-          :database_idle_timeout   => '1',
-          :database_min_pool_size  => '2',
-          :database_db_max_retries => '-1',
-          :database_max_retries    => '3',
-          :database_retry_interval => '4',
-          :database_max_pool_size  => '5',
-          :database_max_overflow   => '6',
-          :database_pool_timeout   => '7',
+          :database_connection              => 'sqlite:////path/to/my/db.sqlite',
+          :database_connection_recycle_time => '1',
+          :database_min_pool_size           => '2',
+          :database_db_max_retries          => '-1',
+          :database_max_retries             => '3',
+          :database_retry_interval          => '4',
+          :database_max_pool_size           => '5',
+          :database_max_overflow            => '6',
+          :database_pool_timeout            => '7',
         }
       end
 
       it { should contain_class('ec2api::deps') }
 
       it { should contain_oslo__db('ec2api_config').with(
-        :connection     => 'sqlite:////path/to/my/db.sqlite',
-        :idle_timeout   => '1',
-        :min_pool_size  => '2',
-        :db_max_retries => '-1',
-        :max_retries    => '3',
-        :retry_interval => '4',
-        :max_pool_size  => '5',
-        :max_overflow   => '6',
-        :pool_timeout   => '7',
+        :connection              => 'sqlite:////path/to/my/db.sqlite',
+        :connection_recycle_time => '1',
+        :min_pool_size           => '2',
+        :db_max_retries          => '-1',
+        :max_retries             => '3',
+        :retry_interval          => '4',
+        :max_pool_size           => '5',
+        :max_overflow            => '6',
+        :pool_timeout            => '7',
       )}
     end
   end