commit 1840f70d0bf15553c39f59b8bee87cd7ea12e8f4
author Jenkins <jenkins@review.openstack.org> Thu Mar 26 11:59:52 2015 +0000
committer Gerrit Code Review <review@openstack.org> Thu Mar 26 11:59:52 2015 +0000
tree 94e64a8ce395471f6617d1a6d84a1beb2b9c0ecb
parent 27ee05bb2c9e17f8131338739237f7dc64984bbe
parent d01ff96e3f330684f3f1041ce6e08f729cf4006c

Merge "Stop using deprecated rabbit related config options"

lib/rpc_backend

diff --git a/lib/rpc_backend b/lib/rpc_backend
index 3d4ef76..3033cbe 100644
--- a/lib/rpc_backend
+++ b/lib/rpc_backend
@@ -272,9 +272,9 @@
         fi
     elif is_service_enabled rabbit || { [ -n "$RABBIT_HOST" ] && [ -n "$RABBIT_PASSWORD" ]; }; then
         iniset $file $section rpc_backend "rabbit"
-        iniset $file $section rabbit_hosts $RABBIT_HOST
-        iniset $file $section rabbit_password $RABBIT_PASSWORD
-        iniset $file $section rabbit_userid $RABBIT_USERID
+        iniset $file oslo_messaging_rabbit rabbit_hosts $RABBIT_HOST
+        iniset $file oslo_messaging_rabbit rabbit_password $RABBIT_PASSWORD
+        iniset $file oslo_messaging_rabbit rabbit_userid $RABBIT_USERID
     fi
 }