From: Thomas Goirand <zigo@debian.org>
Date: Thu, 9 Apr 2015 13:17:14 +0000 (+0200)
Subject: Fixed section in cinder.conf for the rabbitmq credentials.
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=f4c70c4af44058c95400af6eca97eff12cf56a9c;p=openstack-build%2Fcinder-build.git

Fixed section in cinder.conf for the rabbitmq credentials.

Rewritten-From: 992621bc866fde0f18bec05aa1a635cadab71854
---

diff --git a/xenial/debian/cinder-common.config.in b/xenial/debian/cinder-common.config.in
index 3ebfbd6cc..ecc5f685d 100644
--- a/xenial/debian/cinder-common.config.in
+++ b/xenial/debian/cinder-common.config.in
@@ -9,7 +9,7 @@ CINDER_CONF=/etc/cinder/cinder.conf
 
 pkgos_var_user_group cinder
 pkgos_dbc_read_conf -pkg cinder-common ${CINDER_CONF} database connection cinder $@
-pkgos_rabbit_read_conf ${CINDER_CONF} DEFAULT cinder
+pkgos_rabbit_read_conf ${CINDER_CONF} oslo_messaging_rabbit cinder
 pkgos_read_admin_creds ${CINDER_CONF} keystone_authtoken cinder
 
 pkgos_inifile get ${CINDER_CONF} DEFAULT volume_group
diff --git a/xenial/debian/cinder-common.postinst.in b/xenial/debian/cinder-common.postinst.in
index 42cc495dd..00075b8f1 100644
--- a/xenial/debian/cinder-common.postinst.in
+++ b/xenial/debian/cinder-common.postinst.in
@@ -25,7 +25,7 @@ if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ] ; then
 	if [ "$RET" = "true" ]; then
 		pkgos_dbc_postinst ${CINDER_CONF} database connection cinder $@
 	fi
-	pkgos_rabbit_write_conf ${CINDER_CONF} DEFAULT cinder
+	pkgos_rabbit_write_conf ${CINDER_CONF} oslo_messaging_rabbit cinder
 	pkgos_write_admin_creds ${CINDER_CONF} keystone_authtoken cinder
 	db_get cinder/volume_group
 	if [ -n "${RET}" ] ; then