From: Thomas Goirand <zigo@debian.org>
Date: Thu, 23 Apr 2015 09:08:25 +0000 (+0200)
Subject: Fixed section of rabbitmq credentials.
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=58f83333c95414cf20ce9bed13781e710c031331;p=openstack-build%2Fceilometer-build.git

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 be87644..170b4fc 100644
--- 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 903cf1c..830f965 100644
--- 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