From: Thomas Goirand Date: Mon, 11 Nov 2013 16:11:25 +0000 (+0800) Subject: Adds missing RabbitMQ debconf configuration code. X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=373e4dea7d3d664a8510f199109562f3cd58290f;p=openstack-build%2Fneutron-build.git Adds missing RabbitMQ debconf configuration code. Change-Id: Ib31ca61e9bbcfcb15bf626eb60568d689cc70a63 --- diff --git a/debian/changelog b/debian/changelog index 6e339906a..82d3ae4d0 100644 --- 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 Fri, 25 Oct 2013 02:07:11 +0800 diff --git a/debian/neutron-common.config.in b/debian/neutron-common.config.in index 2aaec8f49..0c05f8fd1 100644 --- 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 94b694120..a5182c651 100644 --- 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