openstack/oslo.messaging
Code Issues Proposed changes

rabbit: Clean up deprecated options

Browse Source 
Drop old aliases of oslo_messaging_rabbit options which were deprecated
but have been kept for long time.

Change-Id: Ia84d3619c59a974757cfe188869ff39184590465
This commit is contained in:
Takashi Kajinami 2024-12-12 01:06:22 +09:00
parent 5f92d68e94
commit 7f7d804808
3 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
oslo_messaging/_drivers/amqp.py
View File

@ -37,7 +37,6 @@ amqp_opts = [
'be ignored.'),
cfg.BoolOpt('amqp_auto_delete',
default=False,
deprecated_group='DEFAULT',
help='Auto-delete queues in AMQP.'),
]

10
oslo_messaging/_drivers/impl_rabbit.py
View File

@ -58,7 +58,6 @@ TCP_USER_TIMEOUT = 18
rabbit_opts = [
cfg.IntOpt('rpc_conn_pool_size', default=30,
deprecated_group='DEFAULT',
help='Size of RPC connection pool.',
min=1),
cfg.IntOpt('conn_pool_min_size', default=2,
@ -67,11 +66,9 @@ rabbit_opts = [
help='The time-to-live in sec of idle connections in the pool'),
cfg.BoolOpt('ssl',
default=False,
deprecated_name='rabbit_use_ssl',
help='Connect over SSL.'),
cfg.StrOpt('ssl_version',
default='',
deprecated_name='kombu_ssl_version',
help='SSL version to use (valid only if SSL enabled). '
'Valid values are TLSv1 and SSLv23. SSLv2, SSLv3, '
'TLSv1_1, and TLSv1_2 may be available on some '
@ -79,15 +76,12 @@ rabbit_opts = [
),
cfg.StrOpt('ssl_key_file',
default='',
deprecated_name='kombu_ssl_keyfile',
help='SSL key file (valid only if SSL enabled).'),
cfg.StrOpt('ssl_cert_file',
default='',
deprecated_name='kombu_ssl_certfile',
help='SSL cert file (valid only if SSL enabled).'),
cfg.StrOpt('ssl_ca_file',
default='',
deprecated_name='kombu_ssl_ca_certs',
help='SSL certification authority file '
'(valid only if SSL enabled).'),
cfg.BoolOpt('ssl_enforce_fips_mode',
@ -122,7 +116,6 @@ rabbit_opts = [
default=1.0,
min=0.0,
max=amqpdriver.ACK_REQUEUE_EVERY_SECONDS_MAX * 0.9,
deprecated_group='DEFAULT',
help='How long to wait (in seconds) before reconnecting in '
'response to an AMQP consumer cancel notification.'),
cfg.StrOpt('kombu_compression',
@ -145,14 +138,12 @@ rabbit_opts = [
cfg.StrOpt('rabbit_login_method',
choices=('PLAIN', 'AMQPLAIN', 'EXTERNAL', 'RABBIT-CR-DEMO'),
default='AMQPLAIN',
deprecated_group='DEFAULT',
help='The RabbitMQ login method.'),
cfg.IntOpt('rabbit_retry_interval',
default=1,
help='How frequently to retry connecting with RabbitMQ.'),
cfg.IntOpt('rabbit_retry_backoff',
default=2,
deprecated_group='DEFAULT',
help='How long to backoff for between retries when connecting '
'to RabbitMQ.'),
cfg.IntOpt('rabbit_interval_max',
@ -161,7 +152,6 @@ rabbit_opts = [
'Default is 30 seconds.'),
cfg.BoolOpt('rabbit_ha_queues',
default=False,
deprecated_group='DEFAULT',
help='Try to use HA queues in RabbitMQ (x-ha-policy: all). '
'If you change this option, you must wipe the RabbitMQ '
'database. In RabbitMQ 3.0, queue mirroring is no longer '

25
releasenotes/notes/rabbitmq-opts-cleanup-e0f97d4cc0855c5a.yaml Normal file
View File

@ -0,0 +1,25 @@
---
upgrade:
- |
The deprecated ``[oslo_messaging_rabbit] rabbit_use_ssl`` option has been
removed. Use the ``ssl`` option instead.
- |
The following deprecated options in ``[oslo_messaging_rabbit]`` section
have been removed. Use the ones without ``kombu_`` prefix.
- ``kombu_ssl_version``
- ``kombu_ssl_keyfile``
- ``kombu_ssl_certfile``
- ``kombu_ssl_ca_certs``
- |
The following options are no longer loaded from the ``[DEFAULT]`` section.
Use the ``[oslo_messaging_rabbit]`` section instead.
- ``amqp_auto_delete``
- ``kombu_reconnect_delay``
- ``rabbit_login_method``
- ``rabbit_retry_backoff``
- ``rabbit_ha_queues``
- ``rpc_conn_pool_size``