[PKG-Openstack-devel] Bug#770941: nova-common - Overrides database config in nova.conf

[Bastian Blank]

Control: tags -1 patch
Control: reopen 770944

On Tue, Nov 25, 2014 at 12:37:56PM +0100, Bastian Blank wrote:
> This violates §10.7.3 of the Debian policy: local changes must be
> preserved.

Patch that never resets the connection setting on upgrade.

Bastian

-- 
Bastian Blank
Berater
Telefon: +49 2161 / 4643-194
E-Mail: bastian.blank at credativ.de
credativ GmbH, HRB Mönchengladbach 12080, USt-ID-Nummer: DE204566209
Hohenzollernstr. 133, 41061 Mönchengladbach
Geschäftsführung: Dr. Michael Meskes, Jörg Folz, Sascha Heuer
-------------- next part --------------
diff -Nru nova-2014.1.3/debian/changelog nova-2014.1.3/debian/changelog
--- nova-2014.1.3/debian/changelog	2014-11-11 20:52:52.000000000 +0000
+++ nova-2014.1.3/debian/changelog	2014-12-02 12:20:03.000000000 +0000
@@ -1,3 +1,9 @@
+nova (2014.1.3-6dbc1) UNRELEASED; urgency=medium
+
+  * Don't reset database config.
+
+ -- Bastian Blank <waldi at debian.org>  Tue, 02 Dec 2014 12:19:45 +0000
+
 nova (2014.1.3-6) unstable; urgency=high
 
   [ Mehdi Abaakouk ]
diff -Nru nova-2014.1.3/debian/nova-common.postinst.in nova-2014.1.3/debian/nova-common.postinst.in
--- nova-2014.1.3/debian/nova-common.postinst.in	2014-11-11 20:52:52.000000000 +0000
+++ nova-2014.1.3/debian/nova-common.postinst.in	2014-12-02 12:27:36.000000000 +0000
@@ -76,7 +76,9 @@
 	pkgos_write_new_conf nova logging.conf
 
 	# Tweak config files depending on debconf answers
-	pkgos_dbc_postinst /etc/nova/nova.conf database connection nova $@
+	if [ -z "$2" ] || [ "$1" = "reconfigure" ]; then
+	       	pkgos_dbc_postinst /etc/nova/nova.conf database connection nova $@
+	fi
 	pkgos_rabbit_write_conf /etc/nova/nova.conf DEFAULT nova
 	manage_nova_api_field
 	manage_nova_my_ip_field