From edfe1d9f28a698cfb68fcbd01d358c15ab7cbaee Mon Sep 17 00:00:00 2001
From: Thomas Goirand <zigo@debian.org>
Date: Thu, 9 Apr 2015 15:17:14 +0200
Subject: [PATCH] Fixed section in cinder.conf for the rabbitmq credentials.
Rewritten-From: 992621bc866fde0f18bec05aa1a635cadab71854
---
trusty/debian/cinder-common.config.in | 2 +-
trusty/debian/cinder-common.postinst.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/trusty/debian/cinder-common.config.in b/trusty/debian/cinder-common.config.in
index 3ebfbd6cc..ecc5f685d 100644
--- a/trusty/debian/cinder-common.config.in
+++ b/trusty/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/trusty/debian/cinder-common.postinst.in b/trusty/debian/cinder-common.postinst.in
index 42cc495dd..00075b8f1 100644
--- a/trusty/debian/cinder-common.postinst.in
+++ b/trusty/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
--
2.45.2