Fixed section of the rabbitmq credentials

Rewritten-From: 40e6b310f646d107ecaab12512292f9c00b707a1

diff --git a/trusty/debian/neutron-common.config.in b/trusty/debian/neutron-common.config.in
index b712fbd32236fa63b89acafc9e0b655ca34e2412..99ca227bc2e2f716f061b22100c38e8cfb5fbc94 100644 (file)
--- a/trusty/debian/neutron-common.config.in
+++ b/trusty/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/trusty/debian/neutron-common.postinst.in b/trusty/debian/neutron-common.postinst.in
index 2193a96ac29aa7077baadf4e20e2afdfa7686c43..1c44355bef37602a74aa9d2a2e9d7802267c4dfd 100644 (file)
--- a/trusty/debian/neutron-common.postinst.in
+++ b/trusty/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