From d8c7a83c9c942f11531d488791282f58d23783e4 Mon Sep 17 00:00:00 2001
From: Mahito OGURA <earthdragon77@gmail.com>
Date: Mon, 26 Sep 2016 10:50:46 +0900
Subject: [PATCH] Change several RabbitMQ config settings

"rabbit_userid", "rabbit_password", "rabbit_host" are deprecated for removal.
This patch changes these options to "transport_url" in DEFAULT group.

Change-Id: I0c33a1f84103d07e371e11229276c8cecdc485c4
Related-Bug: #1451226
---
 devstack/lib/magnum | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/devstack/lib/magnum b/devstack/lib/magnum
index 1242f1ac4f..f8c62aaad4 100644
--- a/devstack/lib/magnum
+++ b/devstack/lib/magnum
@@ -127,9 +127,8 @@ function create_magnum_conf {
     # (Re)create ``magnum.conf``
     rm -f $MAGNUM_CONF
     iniset $MAGNUM_CONF DEFAULT debug "$ENABLE_DEBUG_LOG_LEVEL"
-    iniset $MAGNUM_CONF oslo_messaging_rabbit rabbit_userid $RABBIT_USERID
-    iniset $MAGNUM_CONF oslo_messaging_rabbit rabbit_password $RABBIT_PASSWORD
-    iniset $MAGNUM_CONF oslo_messaging_rabbit rabbit_host $RABBIT_HOST
+    iniset $MAGNUM_CONF DEFAULT transport_url \
+          "rabbit://$RABBIT_USERID:$RABBIT_PASSWORD@$RABBIT_HOST"
 
     iniset $MAGNUM_CONF database connection `database_connection_url magnum`
     iniset $MAGNUM_CONF api host "$MAGNUM_SERVICE_HOST"