diff --git a/manifests/init.pp b/manifests/init.pp
index 8bb044d5..2eed0bd0 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -172,10 +172,6 @@
 #   (Optional) Password for decrypting ssl_key_file (if encrypted)
 #   Defaults to $::os_service_default.
 #
-# [*amqp_allow_insecure_clients*]
-#   (Optional) Accept clients using either SSL or plain TCP
-#   Defaults to $::os_service_default.
-#
 # [*amqp_sasl_mechanisms*]
 #   (Optional) Space separated list of acceptable SASL mechanisms
 #   Defaults to $::os_service_default.
@@ -236,6 +232,10 @@
 #   (optional) If set, use this value for max_overflow with sqlalchemy.
 #   Defaults to undef.
 #
+# [*amqp_allow_insecure_clients*]
+#   (Optional) Accept clients using either SSL or plain TCP
+#   Defaults to undef.
+#
 class sahara(
   $package_ensure              = 'present',
   $host                        = $::os_service_default,
@@ -274,7 +274,6 @@ class sahara(
   $amqp_ssl_cert_file          = $::os_service_default,
   $amqp_ssl_key_file           = $::os_service_default,
   $amqp_ssl_key_password       = $::os_service_default,
-  $amqp_allow_insecure_clients = $::os_service_default,
   $amqp_sasl_mechanisms        = $::os_service_default,
   $amqp_sasl_config_dir        = $::os_service_default,
   $amqp_sasl_config_name       = $::os_service_default,
@@ -290,6 +289,7 @@ class sahara(
   $database_max_retries        = undef,
   $database_retry_interval     = undef,
   $database_max_overflow       = undef,
+  $amqp_allow_insecure_clients = undef,
 ) {
 
   include sahara::deps
@@ -297,6 +297,11 @@ class sahara(
   include sahara::db
   include sahara::policy
 
+  if $amqp_allow_insecure_clients != undef {
+    warning('The amqp_allow_insecure_clients parameter is deprecated and \
+will be removed in a future release.')
+  }
+
   if $database_connection != undef {
     warning('The database_connection parameter is deprecated and will be \
 removed in a future realse. Use sahara::db::database_connection instead')
@@ -370,22 +375,21 @@ removed in a future realse. Use sahara::db::database_max_overflow instead')
   }
 
   oslo::messaging::amqp { 'sahara_config':
-    server_request_prefix  => $amqp_server_request_prefix,
-    broadcast_prefix       => $amqp_broadcast_prefix,
-    group_request_prefix   => $amqp_group_request_prefix,
-    container_name         => $amqp_container_name,
-    idle_timeout           => $amqp_idle_timeout,
-    trace                  => $amqp_trace,
-    ssl_ca_file            => $amqp_ssl_ca_file,
-    ssl_cert_file          => $amqp_ssl_cert_file,
-    ssl_key_file           => $amqp_ssl_key_file,
-    ssl_key_password       => $amqp_ssl_key_password,
-    allow_insecure_clients => $amqp_allow_insecure_clients,
-    sasl_mechanisms        => $amqp_sasl_mechanisms,
-    sasl_config_dir        => $amqp_sasl_config_dir,
-    sasl_config_name       => $amqp_sasl_config_name,
-    username               => $amqp_username,
-    password               => $amqp_password,
+    server_request_prefix => $amqp_server_request_prefix,
+    broadcast_prefix      => $amqp_broadcast_prefix,
+    group_request_prefix  => $amqp_group_request_prefix,
+    container_name        => $amqp_container_name,
+    idle_timeout          => $amqp_idle_timeout,
+    trace                 => $amqp_trace,
+    ssl_ca_file           => $amqp_ssl_ca_file,
+    ssl_cert_file         => $amqp_ssl_cert_file,
+    ssl_key_file          => $amqp_ssl_key_file,
+    ssl_key_password      => $amqp_ssl_key_password,
+    sasl_mechanisms       => $amqp_sasl_mechanisms,
+    sasl_config_dir       => $amqp_sasl_config_dir,
+    sasl_config_name      => $amqp_sasl_config_name,
+    username              => $amqp_username,
+    password              => $amqp_password,
   }
 
   if ! is_service_default($use_ssl) and $use_ssl {
diff --git a/releasenotes/notes/deprecate_allow_insecure_clients-option-9904fa81e65daa02.yaml b/releasenotes/notes/deprecate_allow_insecure_clients-option-9904fa81e65daa02.yaml
new file mode 100644
index 00000000..72dff754
--- /dev/null
+++ b/releasenotes/notes/deprecate_allow_insecure_clients-option-9904fa81e65daa02.yaml
@@ -0,0 +1,4 @@
+---
+deprecations:
+  - allow_insecure_clients option is now deprecated for removal, the
+    parameter has no effect.
diff --git a/spec/classes/sahara_init_spec.rb b/spec/classes/sahara_init_spec.rb
index 59d769ce..2fa4facd 100644
--- a/spec/classes/sahara_init_spec.rb
+++ b/spec/classes/sahara_init_spec.rb
@@ -145,7 +145,6 @@ describe 'sahara' do
         it { is_expected.to contain_sahara_config('oslo_messaging_amqp/ssl_cert_file').with_value('<SERVICE DEFAULT>') }
         it { is_expected.to contain_sahara_config('oslo_messaging_amqp/ssl_key_file').with_value('<SERVICE DEFAULT>') }
         it { is_expected.to contain_sahara_config('oslo_messaging_amqp/ssl_key_password').with_value('<SERVICE DEFAULT>') }
-        it { is_expected.to contain_sahara_config('oslo_messaging_amqp/allow_insecure_clients').with_value('<SERVICE DEFAULT>') }
         it { is_expected.to contain_sahara_config('oslo_messaging_amqp/sasl_mechanisms').with_value('<SERVICE DEFAULT>') }
         it { is_expected.to contain_sahara_config('oslo_messaging_amqp/sasl_config_dir').with_value('<SERVICE DEFAULT>') }
         it { is_expected.to contain_sahara_config('oslo_messaging_amqp/sasl_config_name').with_value('<SERVICE DEFAULT>') }