From f5eaa6f9cdd641c19d98eb25de2e74e2e167e787 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Thu, 5 Dec 2013 20:35:58 +0800 Subject: [PATCH] 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. Change-Id: Ic129018979f78fafdd1204bbb5dc7495c9a3c48c --- debian/changelog | 2 ++ debian/neutron-common.postinst.in | 7 +++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 695f52850..73bbe1d8c 100644 --- 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 Thu, 05 Dec 2013 20:30:09 +0800 diff --git a/debian/neutron-common.postinst.in b/debian/neutron-common.postinst.in index ed7edfc21..290efb3f5 100644 --- 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 -- 2.45.2