Remove deprecated aliases of notification options
These were deprecated almost 10 years ago[1]. [1] 33c1010c3281804456a22b769c4bac5ac6a7cca1 Change-Id: Ifa387d9be6125e900eaaf6814319756ef39a463a
This commit is contained in:
parent
9e34e23810
commit
c0ffd6c686
@ -26,8 +26,6 @@ from oslo_messaging.notify import notifier
|
|||||||
LOG = logging.getLogger(__name__)
|
LOG = logging.getLogger(__name__)
|
||||||
|
|
||||||
router_config = cfg.StrOpt('routing_config', default='',
|
router_config = cfg.StrOpt('routing_config', default='',
|
||||||
deprecated_group='DEFAULT',
|
|
||||||
deprecated_name='routing_notifier_config',
|
|
||||||
help='RoutingNotifier configuration file location.')
|
help='RoutingNotifier configuration file location.')
|
||||||
|
|
||||||
CONF = cfg.CONF
|
CONF = cfg.CONF
|
||||||
|
@ -30,26 +30,16 @@ from oslo_messaging import transport as msg_transport
|
|||||||
_notifier_opts = [
|
_notifier_opts = [
|
||||||
cfg.MultiStrOpt('driver',
|
cfg.MultiStrOpt('driver',
|
||||||
default=[],
|
default=[],
|
||||||
deprecated_name='notification_driver',
|
|
||||||
deprecated_group='DEFAULT',
|
|
||||||
help='The Drivers(s) to handle sending notifications. '
|
help='The Drivers(s) to handle sending notifications. '
|
||||||
'Possible values are messaging, messagingv2, '
|
'Possible values are messaging, messagingv2, '
|
||||||
'routing, log, test, noop'),
|
'routing, log, test, noop'),
|
||||||
cfg.StrOpt('transport_url',
|
cfg.StrOpt('transport_url',
|
||||||
deprecated_name='notification_transport_url',
|
|
||||||
deprecated_group='DEFAULT',
|
|
||||||
secret=True,
|
secret=True,
|
||||||
help='A URL representing the messaging driver to use for '
|
help='A URL representing the messaging driver to use for '
|
||||||
'notifications. If not set, we fall back to the same '
|
'notifications. If not set, we fall back to the same '
|
||||||
'configuration used for RPC.'),
|
'configuration used for RPC.'),
|
||||||
cfg.ListOpt('topics',
|
cfg.ListOpt('topics',
|
||||||
default=['notifications', ],
|
default=['notifications', ],
|
||||||
deprecated_opts=[
|
|
||||||
cfg.DeprecatedOpt('topics',
|
|
||||||
group='rpc_notifier2'),
|
|
||||||
cfg.DeprecatedOpt('notification_topics',
|
|
||||||
group='DEFAULT')
|
|
||||||
],
|
|
||||||
help='AMQP topic used for OpenStack notifications.'),
|
help='AMQP topic used for OpenStack notifications.'),
|
||||||
cfg.IntOpt('retry', default=-1,
|
cfg.IntOpt('retry', default=-1,
|
||||||
help='The maximum number of attempts to re-send a notification '
|
help='The maximum number of attempts to re-send a notification '
|
||||||
|
@ -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.
|
Loading…
x
Reference in New Issue
Block a user