From c0ffd6c686fe97cce5f551f654d470b3c9fd92ba Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Tue, 26 Nov 2024 17:06:32 +0900
Subject: [PATCH] Remove deprecated aliases of notification options

These were deprecated almost 10 years ago[1].

[1] 33c1010c3281804456a22b769c4bac5ac6a7cca1

Change-Id: Ifa387d9be6125e900eaaf6814319756ef39a463a
---
 oslo_messaging/notify/_impl_routing.py             |  2 --
 oslo_messaging/notify/notifier.py                  | 10 ----------
 ...ove-deprecated-notif-opts-142f8eea540c17ec.yaml | 14 ++++++++++++++
 3 files changed, 14 insertions(+), 12 deletions(-)
 create mode 100644 releasenotes/notes/remove-deprecated-notif-opts-142f8eea540c17ec.yaml

diff --git a/oslo_messaging/notify/_impl_routing.py b/oslo_messaging/notify/_impl_routing.py
index 80bbb44cd..7d9380967 100644
--- a/oslo_messaging/notify/_impl_routing.py
+++ b/oslo_messaging/notify/_impl_routing.py
@@ -26,8 +26,6 @@ from oslo_messaging.notify import notifier
 LOG = logging.getLogger(__name__)
 
 router_config = cfg.StrOpt('routing_config', default='',
-                           deprecated_group='DEFAULT',
-                           deprecated_name='routing_notifier_config',
                            help='RoutingNotifier configuration file location.')
 
 CONF = cfg.CONF
diff --git a/oslo_messaging/notify/notifier.py b/oslo_messaging/notify/notifier.py
index 6f8c1b7a2..2fca0d8e0 100644
--- a/oslo_messaging/notify/notifier.py
+++ b/oslo_messaging/notify/notifier.py
@@ -30,26 +30,16 @@ from oslo_messaging import transport as msg_transport
 _notifier_opts = [
     cfg.MultiStrOpt('driver',
                     default=[],
-                    deprecated_name='notification_driver',
-                    deprecated_group='DEFAULT',
                     help='The Drivers(s) to handle sending notifications. '
                          'Possible values are messaging, messagingv2, '
                          'routing, log, test, noop'),
     cfg.StrOpt('transport_url',
-               deprecated_name='notification_transport_url',
-               deprecated_group='DEFAULT',
                secret=True,
                help='A URL representing the messaging driver to use for '
                     'notifications. If not set, we fall back to the same '
                     'configuration used for RPC.'),
     cfg.ListOpt('topics',
                 default=['notifications', ],
-                deprecated_opts=[
-                    cfg.DeprecatedOpt('topics',
-                                      group='rpc_notifier2'),
-                    cfg.DeprecatedOpt('notification_topics',
-                                      group='DEFAULT')
-                ],
                 help='AMQP topic used for OpenStack notifications.'),
     cfg.IntOpt('retry', default=-1,
                help='The maximum number of attempts to re-send a notification '
diff --git a/releasenotes/notes/remove-deprecated-notif-opts-142f8eea540c17ec.yaml b/releasenotes/notes/remove-deprecated-notif-opts-142f8eea540c17ec.yaml
new file mode 100644
index 000000000..9b7adf2ae
--- /dev/null
+++ b/releasenotes/notes/remove-deprecated-notif-opts-142f8eea540c17ec.yaml
@@ -0,0 +1,14 @@
+---
+upgrade:
+  - |
+    The following deprecated options have been removed. Use the equivalent
+    options in the ``[oslo_messaging_notifications]`` secion instead.
+
+    - ``[DEFAULT] notification_driver``
+    - ``[DEFAULT] notification_transport_url``
+    - ``[DEFAULT] notification_topics``
+    - ``[DEFAULT] routing_config``
+
+  - |
+    The deprecated ``[rpc_notifier2] topics`` option has been removed. Use
+    the ``[oslo_messaging_notifications] topics`` option instead.