Fixed section of the rabbitmq credentials.

Rewritten-From: 4bbaced6d80ca7f75c569773128d7efaf5ce477b

diff --git a/trusty/debian/heat-common.config.in b/trusty/debian/heat-common.config.in
index 2dbe8dc66257837c615a15518ca4c20b63462b94..14db0b56d85eef75ce71bc8d1a9ee7423379bd69 100644 (file)
--- a/trusty/debian/heat-common.config.in
+++ b/trusty/debian/heat-common.config.in
@@ -10,7 +10,7 @@ CONF=/etc/heat/heat.conf
 
 pkgos_var_user_group heat
 pkgos_dbc_read_conf -pkg heat-common ${CONF} database connection heat $@
-pkgos_rabbit_read_conf ${CONF} DEFAULT heat
+pkgos_rabbit_read_conf ${CONF} oslo_messaging_rabbit heat
 pkgos_read_admin_creds ${CONF} keystone_authtoken heat
 pkgos_register_endpoint_config heat
 

diff --git a/trusty/debian/heat-common.postinst.in b/trusty/debian/heat-common.postinst.in
index 1374b2314475984c9cd5b8be18b1651a43aa54a4..dfc004187cb1f68ad328fed5b47222a802a2e9eb 100644 (file)
--- a/trusty/debian/heat-common.postinst.in
+++ b/trusty/debian/heat-common.postinst.in
@@ -23,7 +23,7 @@ if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ] ; then
        if [ "$RET" = "true" ] ; then
                pkgos_dbc_postinst ${CONF} database connection heat $@
        fi
-       pkgos_rabbit_write_conf ${CONF} DEFAULT heat
+       pkgos_rabbit_write_conf ${CONF} oslo_messaging_rabbit heat
         pkgos_write_admin_creds ${CONF} keystone_authtoken heat
        pkgos_register_endpoint_postinst heat heat orchestration "Heat Orchestration API" 8004 /v1/'%(tenant_id)s'
        # This is the equivalent of db-sync: