From 9676c66dc382b7a508ea3def9bc379d0729d80cb Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Mon, 14 Aug 2023 10:39:21 +0900
Subject: [PATCH] Deprecate support for amqp1 driver

The amqp1 driver has been deprecated in oslo.messaging because of
lack of qpid_dispatch module. This deprecates support for the driver.

Because deprecating all parameters for amqp1 driver needs large changes
in multiple modules, this change introduces the logic to detect usage
of amqp1 driver and shows the warning instead.

Depends-on: https://review.opendev.org/861070/
Change-Id: Ia176b8d881eb9bd1bb5e22b437b4e60ecd6963af
---
 manifests/messaging/amqp.pp                                  | 1 +
 manifests/messaging/default.pp                               | 4 ++++
 manifests/messaging/notifications.pp                         | 4 ++++
 .../notes/deprecate-amqp1-driver-18eae241ab01b487.yaml       | 5 +++++
 4 files changed, 14 insertions(+)
 create mode 100644 releasenotes/notes/deprecate-amqp1-driver-18eae241ab01b487.yaml

diff --git a/manifests/messaging/amqp.pp b/manifests/messaging/amqp.pp
index 6cc66c6..b1d558c 100644
--- a/manifests/messaging/amqp.pp
+++ b/manifests/messaging/amqp.pp
@@ -1,5 +1,6 @@
 # == Define: oslo::messaging::amqp
 #
+# DEPRECATED !!
 # Configure oslo_messaging_amqp options
 #
 # This resource configures Oslo messaging resources for an OpenStack service.
diff --git a/manifests/messaging/default.pp b/manifests/messaging/default.pp
index b3daa3c..469e75c 100644
--- a/manifests/messaging/default.pp
+++ b/manifests/messaging/default.pp
@@ -37,6 +37,10 @@ define oslo::messaging::default(
   $control_exchange          = $facts['os_service_default'],
 ) {
 
+  if $transport_url =~ 'amqp://.+' {
+    warning('amqp1 driver support has been deprecated, because the driver is deprecated.')
+  }
+
   $default_options = {
     'DEFAULT/executor_thread_pool_size' => { value => $executor_thread_pool_size },
     'DEFAULT/rpc_response_timeout'      => { value => $rpc_response_timeout },
diff --git a/manifests/messaging/notifications.pp b/manifests/messaging/notifications.pp
index 3fa394e..df91066 100644
--- a/manifests/messaging/notifications.pp
+++ b/manifests/messaging/notifications.pp
@@ -33,6 +33,10 @@ define oslo::messaging::notifications(
   $topics        = $facts['os_service_default'],
 ) {
 
+  if $transport_url =~ 'amqp://.+' {
+    warning('amqp driver support has been deprecated, because the driver is deprecated.')
+  }
+
   # When we have a string value for driver,  we keep passing it as string
   # to reduce any chance of breaking things in a backwards incompatible way
   $driver_real = $driver ? {
diff --git a/releasenotes/notes/deprecate-amqp1-driver-18eae241ab01b487.yaml b/releasenotes/notes/deprecate-amqp1-driver-18eae241ab01b487.yaml
new file mode 100644
index 0000000..3f6d7c8
--- /dev/null
+++ b/releasenotes/notes/deprecate-amqp1-driver-18eae241ab01b487.yaml
@@ -0,0 +1,5 @@
+---
+deprecations:
+  - |
+    Support for the amqp1 driver has been deprecated and will be removed in
+    a future release.