Adds missing RabbitMQ debconf configuration code.

Change-Id: Ib31ca61e9bbcfcb15bf626eb60568d689cc70a63

diff --git a/debian/changelog b/debian/changelog
index 6e339906a541d32cdd6880149105b19a319b2f7e..82d3ae4d0effd03ba63b28fff4dff719031cdf49 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 neutron (2013.2-5) UNRELEASED; urgency=low
 
   * Added missing python-babel depends in python-neutron.
+  * Adds missing RabbitMQ debconf configuration code.
 
  -- Thomas Goirand <zigo@debian.org>  Fri, 25 Oct 2013 02:07:11 +0800
 

diff --git a/debian/neutron-common.config.in b/debian/neutron-common.config.in
index 2aaec8f4926631e011714b213305535a2c744c5f..0c05f8fd11455ce636d2574245161468af6c4ee3 100644 (file)
--- a/debian/neutron-common.config.in
+++ b/debian/neutron-common.config.in
@@ -65,6 +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
 
 # Configure the keystone_authtoken
 pkgos_read_admin_creds ${N_CONF} keystone_authtoken neutron

diff --git a/debian/neutron-common.postinst.in b/debian/neutron-common.postinst.in
index 94b694120eb1493fa7d530e35b97ff22cfd03d36..a5182c65190a98823981697b1213277d887a1148 100644 (file)
--- a/debian/neutron-common.postinst.in
+++ b/debian/neutron-common.postinst.in
@@ -72,6 +72,9 @@ if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ] ; then
                pkgos_inifile set DEFAULT ${N_CONF} ${NEUTRON_PLUGIN_CLASS}
        fi
 
+       # Write the neutron RabbitMQ credentials
+       pkgos_rabbit_write_conf ${N_CONF} DEFAULT neutron
+
        # Set the keystone_authtoken directive
        pkgos_write_admin_creds ${N_CONF} keystone_authtoken neutron