commit e41690d8684f46b0ffb835ab51a165bcddcf697c
author Jenkins <jenkins@review.openstack.org> Tue Mar 17 18:27:06 2015 +0000
committer Gerrit Code Review <review@openstack.org> Tue Mar 17 18:27:06 2015 +0000
tree 7064e758a025cc7d470d1dc0b16de3c15acda3ca
parent 706996da7d6416b014889e340c5c1606fc11ee5b
parent 5dfecc8966912c2f74a4c7ecc85dd5f0b930cd99

Merge "Keystone RPC backend config consistency"

lib/keystone

diff --git a/lib/keystone b/lib/keystone
index 0968445..c9433d9 100644
--- a/lib/keystone
+++ b/lib/keystone
@@ -226,12 +226,7 @@
         iniset $KEYSTONE_CONF assignment driver "keystone.assignment.backends.$KEYSTONE_ASSIGNMENT_BACKEND.Assignment"
     fi
 
-    # Configure rabbitmq credentials
-    if is_service_enabled rabbit; then
-        iniset $KEYSTONE_CONF DEFAULT rabbit_userid $RABBIT_USERID
-        iniset $KEYSTONE_CONF DEFAULT rabbit_password $RABBIT_PASSWORD
-        iniset $KEYSTONE_CONF DEFAULT rabbit_host $RABBIT_HOST
-    fi
+    iniset_rpc_backend keystone $KEYSTONE_CONF DEFAULT
 
     # Set the URL advertised in the ``versions`` structure returned by the '/' route
     if is_service_enabled tls-proxy; then