[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#775288: unblock: openstack-trove/2014.1.3-7



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Dear release team,

Here's a list of changes:

*/ Package is rebuilt against openstack-pkg-tools >= 22~ to fix the
last systemd issue that was preventing startup of daemons on the first
install (see unblock bug #775278).

*/ To make sure the database directive is left unchanged unless the
user explicitely asked for automated management, and for consistency
across all OpenStack packages, the trove/configure_db debconf variable
default value is now set to false.

*/ For consistency with other OpenStack packages and to allow a better
compatibility with official puppet scripts, the postinst doesn't touch
the db connection directive and doesn't do the "trove-manage db_sync"
unless explicitely requested by the user through debconf. The
pkgos_dbc_postinst isn't called either if no db management is requested.

Please unblock package openstack-trove/2014.1.3-7. Debdiff attached.

Cheers,

Thomas Goirand (zigo)

P.S: Please note that I only generate debdiff for the changes which
haven't been agreed on previously.
diff -Nru openstack-trove-2014.1.3/debian/changelog openstack-trove-2014.1.3/debian/changelog
--- openstack-trove-2014.1.3/debian/changelog	2015-01-07 00:05:15.000000000 +0000
+++ openstack-trove-2014.1.3/debian/changelog	2015-01-08 16:54:35.000000000 +0000
@@ -1,3 +1,18 @@
+openstack-trove (2014.1.3-7) unstable; urgency=medium
+
+  * Fixes nova/configure_db -> trove/configure_db.
+
+ -- Thomas Goirand <zigo@debian.org>  Thu, 08 Jan 2015 16:54:10 +0000
+
+openstack-trove (2014.1.3-6) unstable; urgency=medium
+
+  * trove/configure_db is now false by default.
+  * Only runs pkgos_dbc_postinst and trove-manage db_sync if trove/configure_db
+    is true.
+  * Build-depends on openstack-pkg-tools (>= 22~) to ensure correct init.
+
+ -- Thomas Goirand <zigo@debian.org>  Thu, 08 Jan 2015 16:48:04 +0000
+
 openstack-trove (2014.1.3-5) unstable; urgency=medium
 
   * Also purges /var/lib/trove when package is purged (Closes: #769771).
diff -Nru openstack-trove-2014.1.3/debian/control openstack-trove-2014.1.3/debian/control
--- openstack-trove-2014.1.3/debian/control	2015-01-07 00:05:15.000000000 +0000
+++ openstack-trove-2014.1.3/debian/control	2015-01-08 16:54:35.000000000 +0000
@@ -6,7 +6,7 @@
            Thomas Goirand <zigo@debian.org>,
            Mehdi Abaakouk <sileht@sileht.net>
 Build-Depends: debhelper (>= 9),
-               openstack-pkg-tools (>= 21~),
+               openstack-pkg-tools (>= 22~),
                po-debconf,
                python-all (>= 2.6.6-3~),
                python-pbr (>= 0.6),
diff -Nru openstack-trove-2014.1.3/debian/trove-common.postinst.in openstack-trove-2014.1.3/debian/trove-common.postinst.in
--- openstack-trove-2014.1.3/debian/trove-common.postinst.in	2015-01-07 00:05:15.000000000 +0000
+++ openstack-trove-2014.1.3/debian/trove-common.postinst.in	2015-01-08 16:54:35.000000000 +0000
@@ -10,9 +10,15 @@
 	pkgos_var_user_group trove
 	pkgos_write_new_conf trove trove.conf
 	pkgos_write_new_conf trove api-paste.ini
-	pkgos_dbc_postinst /etc/trove/trove.conf DEFAULT sql_connection trove $@
+	db_get trove/configure_db
+	if [ "$RET" = "true" ]; then
+		pkgos_dbc_postinst /etc/trove/trove.conf DEFAULT sql_connection trove $@
+	fi
 	pkgos_write_admin_creds /etc/trove/api-paste.ini filter:authtoken trove
-	trove-manage db_sync
+	db_get trove/configure_db
+	if [ "$RET" = "true" ]; then
+		trove-manage db_sync
+	fi
 	db_stop
 fi
 
diff -Nru openstack-trove-2014.1.3/debian/trove-common.templates openstack-trove-2014.1.3/debian/trove-common.templates
--- openstack-trove-2014.1.3/debian/trove-common.templates	2015-01-07 00:05:15.000000000 +0000
+++ openstack-trove-2014.1.3/debian/trove-common.templates	2015-01-08 16:54:35.000000000 +0000
@@ -9,7 +9,7 @@
 
 Template: trove/configure_db
 Type: boolean
-Default: true
+Default: false
 _Description: Set up a database for Trove?
  No database has been set up for trove to use. Before continuing, you should
  make sure you have the following information:

Reply to: