Do not call neutron-db-manage --config-file /etc/neutron/neutron.conf upgrade head...

Change-Id: Ic129018979f78fafdd1204bbb5dc7495c9a3c48c

diff --git a/debian/changelog b/debian/changelog
index 695f528507378f52cf172cbb634ac4cb0296da32..73bbe1d8c1275dc12632770bf45f7d75bde57095 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 neutron (2013.2-9) unstable; urgency=medium
 
   * Added missing handling of ml2 plugin in neutron-common.postinst.
+  * Do not call neutron-db-manage --config-file /etc/neutron/neutron.conf
+    upgrade head if the user didn't ask for db management through debconf.
 
  -- Thomas Goirand <zigo@debian.org>  Thu, 05 Dec 2013 20:30:09 +0800
 

diff --git a/debian/neutron-common.postinst.in b/debian/neutron-common.postinst.in
index ed7edfc214acf5cffb820b4b12ec49b3cb141a25..290efb3f512458cdad574784db7ad1ebb2c6e884 100644 (file)
--- a/debian/neutron-common.postinst.in
+++ b/debian/neutron-common.postinst.in
@@ -84,8 +84,11 @@ if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ] ; then
        # Set the sql_connection directive
         pkgos_dbc_postinst --suite neutron ${N_CONF} database connection neutron $@
 
-       # Migrating to latest release of the db
-       neutron-db-manage --config-file /etc/neutron/neutron.conf upgrade head
+       db_get neutron/configure_db
+       if [ "$RET" = "true" ] ; then
+               # Migrating to latest release of the db
+               neutron-db-manage --config-file /etc/neutron/neutron.conf upgrade head
+       fi
 
        # Maintain the OVS config
         if [ ! -e ${OVS_CONF} ] ; then