summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.zuul.yaml1
-rw-r--r--oslo_messaging/_drivers/impl_rabbit.py12
-rw-r--r--tox.ini2
3 files changed, 7 insertions, 8 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/oslo_messaging/_drivers/impl_rabbit.py b/oslo_messaging/_drivers/impl_rabbit.py
index 10f0c2d..ec5cda9 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 "
diff --git a/tox.ini b/tox.ini
index bed65f9..15c6f45 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,7 +12,7 @@ passenv = OS_*
REQUIREMENTS_PIP_LOCATION
install_command = pip install {opts} {packages}
deps =
- -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+ -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/test-requirements.txt
-r{toxinidir}/requirements.txt
commands = stestr run --slowest {posargs}