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

Fixed section of the rabbitmq credentials

Rewritten-From: 40e6b310f646d107ecaab12512292f9c00b707a1
---

diff --git a/xenial/debian/neutron-common.config.in b/xenial/debian/neutron-common.config.in
index b712fbd32..99ca227bc 100644
--- a/xenial/debian/neutron-common.config.in
+++ b/xenial/debian/neutron-common.config.in
@@ -65,7 +65,7 @@ chmod 755 /var/lib/neutron
 
 # Configure the SQL connection
 pkgos_dbc_read_conf -pkg neutron-common ${N_CONF} database connection neutron $@
-pkgos_rabbit_read_conf ${N_CONF} DEFAULT neutron
+pkgos_rabbit_read_conf ${N_CONF} oslo_messaging_rabbit neutron
 
 # Configure the keystone_authtoken
 pkgos_read_admin_creds ${N_CONF} keystone_authtoken neutron
diff --git a/xenial/debian/neutron-common.postinst.in b/xenial/debian/neutron-common.postinst.in
index 2193a96ac..1c44355be 100644
--- a/xenial/debian/neutron-common.postinst.in
+++ b/xenial/debian/neutron-common.postinst.in
@@ -89,7 +89,7 @@ if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ] ; then
 	fi
 
 	# Write the neutron RabbitMQ credentials
-	pkgos_rabbit_write_conf ${N_CONF} DEFAULT neutron
+	pkgos_rabbit_write_conf ${N_CONF} oslo_messaging_rabbit neutron
 
 	# Set the keystone_authtoken directive
 	pkgos_write_admin_creds ${N_CONF} keystone_authtoken neutron