Browse Source

Fix type of direct_mandatory_flag opt

An IntOpt with a default of True is invalid. I'm a little surprised
this doesn't fail a defaults check somewhere, but it needs to be
fixed regardless.

Looking at where it is used, it appears the boolean type is correct.
This just changes the opt type to BoolOpt to match.

Conflicts:
  oslo_messaging/_drivers/impl_rabbit.py

NOTE(hberaud): Conflicts are due to a patch [1][2] not yet backported on
train and which added a new option on other branches.

[1] 196fa877a9
[2] https://review.opendev.org/c/openstack/oslo.messaging/+/747892

Change-Id: I01a38754a31c891f2b3b9c7f8135690693df5d13
Closes-Bug: 1909036
(cherry picked from commit b8f8b17030e93f6fe64e986ebae1de4011f007d5)
(cherry picked from commit a0329a3f86e8bf275dd4e16c1f354911a6ff2eb6)
(cherry picked from commit 3bf9ba550454719f1d56dbbf8bccbabab11a16f6)
changes/16/776416/1 10.2.3
Ben Nemec 4 months ago
committed by Hervé Beraud
parent
commit
56fc332608
1 changed files with 6 additions and 6 deletions
  1. +6
    -6
      oslo_messaging/_drivers/impl_rabbit.py

+ 6
- 6
oslo_messaging/_drivers/impl_rabbit.py View File

@ -168,12 +168,12 @@ rabbit_opts = [
default=2,
help='How often times during the heartbeat_timeout_threshold '
'we check the heartbeat.'),
cfg.IntOpt('direct_mandatory_flag',
default=True,
help='Enable/Disable the RabbitMQ mandatory flag '
'for direct send. The direct send is used as reply,'
'so the MessageUndeliverable exception is raised'
' in case the client queue does not exist.'),
cfg.BoolOpt('direct_mandatory_flag',
default=True,
help='Enable/Disable the RabbitMQ mandatory flag '
'for direct send. The direct send is used as reply, '
'so the MessageUndeliverable exception is raised '
'in case the client queue does not exist.'),
]
LOG = logging.getLogger(__name__)


Loading…
Cancel
Save