From b92ea91a5ab546a61a90784ca42c4bb02351323a Mon Sep 17 00:00:00 2001
From: lqslan <lqslan@cn.ibm.com>
Date: Thu, 19 Mar 2015 16:58:33 +0800
Subject: [PATCH] Make option [DEFAULT]amqp_durable_queues work
Currently, the option amqp_durable_queues is both deprecated with name
and group that cause the option [DEFAULT]amqp_durable_queues can't work.
This patch use multi deprecated options to make it work.
Change-Id: Ied28bcf415362a976928bac75225018030304ac7
Closes-Bug: #1433956
---
oslo_messaging/_drivers/amqp.py | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/oslo_messaging/_drivers/amqp.py b/oslo_messaging/_drivers/amqp.py
index 0b8cafaa6..80dc53028 100644
--- 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,