diff --git a/manifests/messaging/rabbit.pp b/manifests/messaging/rabbit.pp
index b62b8a3..80879dd 100644
--- a/manifests/messaging/rabbit.pp
+++ b/manifests/messaging/rabbit.pp
@@ -129,12 +129,6 @@
 #   we check the heartbeat. (integer value)
 #   Defaults to $::os_service_default
 #
-# DEPRECATED PARAMETERS
-#
-# [*rabbit_max_retries*]
-#   (Optional) Maximum number of RabbitMQ connection retries. (integer value)
-#   Defaults to undef
-#
 define oslo::messaging::rabbit(
   $amqp_durable_queues                  = $::os_service_default,
   $kombu_ssl_version                    = $::os_service_default,
@@ -161,8 +155,6 @@ define oslo::messaging::rabbit(
   $rabbit_transient_queues_ttl          = $::os_service_default,
   $heartbeat_timeout_threshold          = $::os_service_default,
   $heartbeat_rate                       = $::os_service_default,
-  # DEPRECATED PARAMETERS
-  $rabbit_max_retries                   = undef,
 ){
 
   if $rabbit_use_ssl != true {
@@ -180,10 +172,6 @@ define oslo::messaging::rabbit(
     }
   }
 
-  if $rabbit_max_retries {
-    warning('The rabbit_max_retries parameter has been deprecated and will be removed in the future release.')
-  }
-
   if !is_service_default($kombu_compression) and !($kombu_compression in ['gzip','bz2']) {
     fail('Unsupported Kombu compression. Possible values are gzip and bz2')
   }
diff --git a/releasenotes/notes/remove_deprecated_rabbit_max_retries_option-86f90600cb43f6c1.yaml b/releasenotes/notes/remove_deprecated_rabbit_max_retries_option-86f90600cb43f6c1.yaml
new file mode 100644
index 0000000..9a636d2
--- /dev/null
+++ b/releasenotes/notes/remove_deprecated_rabbit_max_retries_option-86f90600cb43f6c1.yaml
@@ -0,0 +1,3 @@
+---
+upgrade:
+  - Deprecated rabbit_max_retries option has been removed.