diff --git a/manifests/db.pp b/manifests/db.pp
index d244d281..0fd5f347 100644
--- a/manifests/db.pp
+++ b/manifests/db.pp
@@ -46,13 +46,6 @@
 #   (Optional) Run db sync on nodes after connection setting has been set.
 #   Defaults to true
 #
-# DEPRECATED PARAMETERS
-#
-# [*database_idle_timeout*]
-#   Timeout when db connections should be reaped.
-#   Defaults to undef.
-#
-
 class heat::db (
   $database_connection              = 'sqlite:////var/lib/heat/heat.sqlite',
   $database_connection_recycle_time = $::os_service_default,
@@ -64,21 +57,14 @@ class heat::db (
   $database_pool_timeout            = $::os_service_default,
   $database_db_max_retries          = $::os_service_default,
   $sync_db                          = true,
-  # DEPRECATED PARAMETERS
-  $database_idle_timeout            = undef,
 ) {
 
   include heat::deps
 
-  if $database_idle_timeout {
-    warning('The database_idle_timeout parameter is deprecated. Please use \
-database_connection_recycle_time instead.')
-  }
-
   # NOTE(spredzy): In order to keep backward compatibility we rely on the pick function
   # to use heat::<myparam> if heat::db::<myparam> isn't specified.
   $database_connection_real = pick($::heat::database_connection, $database_connection)
-  $database_connection_recycle_time_real = pick($::heat::database_idle_timeout, $database_idle_timeout, $database_connection_recycle_time)
+  $database_connection_recycle_time_real = pick($::heat::database_idle_timeout, $database_connection_recycle_time)
   $database_min_pool_size_real = pick($::heat::database_min_pool_size, $database_min_pool_size)
   $database_max_pool_size_real = pick($::heat::database_max_pool_size, $database_max_pool_size)
   $database_max_retries_real = pick($::heat::database_max_retries, $database_max_retries)
diff --git a/releasenotes/notes/remove_idle_timeout_option-bece49d2cb331cdf.yaml b/releasenotes/notes/remove_idle_timeout_option-bece49d2cb331cdf.yaml
new file mode 100644
index 00000000..6ba54d41
--- /dev/null
+++ b/releasenotes/notes/remove_idle_timeout_option-bece49d2cb331cdf.yaml
@@ -0,0 +1,3 @@
+---
+upgrade:
+  - Deprecated idle_timeout option has been removed.