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 3ebfbd6cc77d5b4bd6290515059098fca3174297..ecc5f685d886bdb7a55ea07c403ec201eaf715f9 100644 (file)
--- 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 42cc495dd3c8c24a0f63a11b07f2ded5bbe61244..00075b8f11a4fdcd1313d87ea975c1e73cf77318 100644 (file)
--- 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