Fixed section of rabbitmq credentials.

Rewritten-From: bdfdb8aa4aa35146b0caa9c0e56b96bf4baf4fd6

diff --git a/trusty/debian/ceilometer-common.config.in b/trusty/debian/ceilometer-common.config.in
index be87644b0660afc83ab5a09a6f7166421e1699db..170b4fc3d7b32370df709dc8729fdd51af36019c 100644 (file)
--- a/trusty/debian/ceilometer-common.config.in
+++ b/trusty/debian/ceilometer-common.config.in
@@ -6,7 +6,7 @@ set -e
 
 #PKGOS-INCLUDE#
 
-pkgos_rabbit_read_conf /etc/ceilometer/ceilometer.conf DEFAULT ceilometer
+pkgos_rabbit_read_conf /etc/ceilometer/ceilometer.conf oslo_messaging_rabbit ceilometer
 pkgos_read_admin_creds /etc/ceilometer/ceilometer.conf keystone_authtoken ceilometer
 
 exit 0

diff --git a/trusty/debian/ceilometer-common.postinst.in b/trusty/debian/ceilometer-common.postinst.in
index 903cf1ca648b4eb26d36bf208d155e3107bea144..830f965eaafadf3dd5d5a75db474b746abcf287f 100644 (file)
--- a/trusty/debian/ceilometer-common.postinst.in
+++ b/trusty/debian/ceilometer-common.postinst.in
@@ -42,7 +42,7 @@ if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ] ; then
        adduser ceilometer nova || true
        adduser ceilometer ${LIBVIRT_GROUP} || true
        pkgos_write_new_conf ceilometer ceilometer.conf
-       pkgos_rabbit_write_conf /etc/ceilometer/ceilometer.conf DEFAULT ceilometer
+       pkgos_rabbit_write_conf /etc/ceilometer/ceilometer.conf oslo_messaging_rabbit ceilometer
        pkgos_write_admin_creds /etc/ceilometer/ceilometer.conf keystone_authtoken ceilometer
        ceilometer-dbsync || true
 fi