From 30d3b687931dfc2fcda42d08891ebbcf027698cb Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Wed, 18 May 2022 13:30:54 +0900
Subject: [PATCH] Remove allow_insecure_clients

... because it was deprecated during Wallaby cycle[1].

[1] c08a99f05cacb37e18554dd07f35ebf0a2ba3178

Change-Id: I4a76fb16e4fbb3711db5c86ab35000334e95c124
---
 manifests/messaging/amqp.pp                         | 13 -------------
 ...ove-allow_insecure_clients-f722cf425ec452d4.yaml |  5 +++++
 2 files changed, 5 insertions(+), 13 deletions(-)
 create mode 100644 releasenotes/notes/remove-allow_insecure_clients-f722cf425ec452d4.yaml

diff --git a/manifests/messaging/amqp.pp b/manifests/messaging/amqp.pp
index 92c6ee8..c756add 100644
--- a/manifests/messaging/amqp.pp
+++ b/manifests/messaging/amqp.pp
@@ -121,12 +121,6 @@
 #   (Optional) The deadline for a sent notification message delivery
 #   Defaults to $::os_service_default.
 #
-# DEPRECATED PARAMETERS
-#
-# [*allow_insecure_clients*]
-#   (Optional) Accept clients using either SSL or plain TCP
-#   Defaults to undef.
-#
 define oslo::messaging::amqp(
   $addressing_mode               = $::os_service_default,
   $server_request_prefix         = $::os_service_default,
@@ -156,15 +150,8 @@ define oslo::messaging::amqp(
   $password                      = $::os_service_default,
   $default_send_timeout          = $::os_service_default,
   $default_notify_timeout        = $::os_service_default,
-  # DEPRECATED PARAMETERS
-  $allow_insecure_clients        = undef,
 ){
 
-  if $allow_insecure_clients != undef {
-    warning('The allow_insecure_clients parameter is deprecated and \
-will be removed in a future release.')
-  }
-
   $amqp_options={ 'oslo_messaging_amqp/addressing_mode'               => { value => $addressing_mode },
                   'oslo_messaging_amqp/server_request_prefix'         => { value => $server_request_prefix },
                   'oslo_messaging_amqp/broadcast_prefix'              => { value => $broadcast_prefix },
diff --git a/releasenotes/notes/remove-allow_insecure_clients-f722cf425ec452d4.yaml b/releasenotes/notes/remove-allow_insecure_clients-f722cf425ec452d4.yaml
new file mode 100644
index 0000000..123a4be
--- /dev/null
+++ b/releasenotes/notes/remove-allow_insecure_clients-f722cf425ec452d4.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    The ``allow_insecure_clients`` parameter of
+    the ``oslo::messaging::amqp`` defined resource type has been removed.