Merge "Make option [DEFAULT]amqp_durable_queues work"

2015-03-19 11:39:37 +00:00 · 2015-03-19 11:39:37 +00:00 · 2e29b268d2
commit 2e29b268d2
parent eb0c330067 b92ea91a5a
1 changed files with 8 additions and 2 deletions
--- a/oslo_messaging/_drivers/amqp.py
+++ b/oslo_messaging/_drivers/amqp.py
@ -34,11 +34,17 @@ import six
 from oslo_messaging._drivers import common as rpc_common
 from oslo_messaging._drivers import pool

+deprecated_durable_opts = [
+    cfg.DeprecatedOpt('amqp_durable_queues',
+                      group='DEFAULT'),
+    cfg.DeprecatedOpt('rabbit_durable_queues',
+                      group='DEFAULT')
+]
+
 amqp_opts = [
    cfg.BoolOpt('amqp_durable_queues',
                default=False,
-                deprecated_name='rabbit_durable_queues',
-                deprecated_group='DEFAULT',
+                deprecated_opts=deprecated_durable_opts,
                help='Use durable queues in AMQP.'),
    cfg.BoolOpt('amqp_auto_delete',
                default=False,