summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.zuul.yaml1
-rw-r--r--doc/source/admin/rabbit.rst4
-rw-r--r--oslo_messaging/_drivers/impl_rabbit.py12
3 files changed, 8 insertions, 9 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
index f7de7b2..db99dee 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -108,7 +108,6 @@
- check-requirements
- lib-forward-testing-python3
- openstack-cover-jobs
- - openstack-lower-constraints-jobs
- openstack-python3-wallaby-jobs
- periodic-stable-jobs
- publish-openstack-docs-pti
diff --git a/doc/source/admin/rabbit.rst b/doc/source/admin/rabbit.rst
index 72c438c..7e75f6a 100644
--- a/doc/source/admin/rabbit.rst
+++ b/doc/source/admin/rabbit.rst
@@ -101,8 +101,8 @@ routed to the corresponding queue who binding key is matched.
Exchange types
~~~~~~~~~~~~~~
-`direct`
-^^^^^^^^
+``direct``
+^^^^^^^^^^
A direct exchange is an exchange which route messages to queues based on
message routing key. Message will be directly delivered to the queue that
diff --git a/oslo_messaging/_drivers/impl_rabbit.py b/oslo_messaging/_drivers/impl_rabbit.py
index f436cbe..756641b 100644
--- a/oslo_messaging/_drivers/impl_rabbit.py
+++ b/oslo_messaging/_drivers/impl_rabbit.py
@@ -169,12 +169,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.'),
cfg.BoolOpt('enable_cancel_on_failover',
default=False,
help="Enable x-cancel-on-ha-failover flag so that "