Bug#775282: unblock: keystone/2014.1.3-6

[Thomas Goirand <zigo@debian.org>]

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

Dear release team,

Here's a list of changes:

*/ For some reason, the database initialization was depending on the
dbc_upgrade variable, which is wrong: we really want the database to
be initialized at install time if keystone/configure_db is true. This
upload corrects that too. This fixes bug #767715 with the
openstack-deploy script / package where Keystone was failing to start
and therefore destroying all subsequent automated installation (with
an error 500 when trying to use the daemon).

*/ The "deb-systemd-helper unmask" is now called before the invoke-rc.d
so that the daemon starts when the package is installed if we're using
systemd.

Note that, to the contrary of other OpenStack packages, Keystone is not
using #DEBHELPER# in its postinst and daemon startup / management is
done by hand, so that OpenStack tenant and endpoints can be created
once Keystone is started. Therefore, Keystone doesn't need to build-
depends on openstack-pkg-tools >= 22~ (version 21 is fine).

Please unblock package keystone/2014.1.3-6. Debdiff attached.

Cheers,

Thomas Goirand (zigo)

diff -Nru keystone-2014.1.3/debian/changelog keystone-2014.1.3/debian/changelog
--- keystone-2014.1.3/debian/changelog	2015-01-06 20:27:39.000000000 +0000
+++ keystone-2014.1.3/debian/changelog	2015-01-09 00:29:34.000000000 +0000
@@ -1,3 +1,11 @@
+keystone (2014.1.3-6) unstable; urgency=medium
+
+  * unmask systemd service before starting the init script / unit file.
+  * Removed dbc_upgrade = true check before pkgos_dbc_postinst and
+    db_sync calls (Closes: #767715).
+
+ -- Thomas Goirand <zigo@debian.org>  Thu, 08 Jan 2015 23:05:48 +0000
+
 keystone (2014.1.3-5) unstable; urgency=medium
 
   * Fix cron job to not error after package removal (Closes: #773494).
diff -Nru keystone-2014.1.3/debian/keystone.postinst.in keystone-2014.1.3/debian/keystone.postinst.in
--- keystone-2014.1.3/debian/keystone.postinst.in	2015-01-06 20:27:39.000000000 +0000
+++ keystone-2014.1.3/debian/keystone.postinst.in	2015-01-09 00:29:34.000000000 +0000
@@ -86,7 +86,7 @@
 
 	# Upgrade or create the db if directed to do so
 	db_get keystone/configure_db
-	if [ "$RET" = "true" ] && [ "$dbc_upgrade" = "true" ] ; then
+	if [ "$RET" = "true" ] ; then
 		# Configure the SQL connection of keystone.conf according to dbconfig-common
 		pkgos_dbc_postinst ${KEY_CONF} database connection keystone $@
 		su keystone -c "keystone-manage db_sync"
@@ -97,6 +97,14 @@
 	# isn't a problem.
 	su keystone -c "keystone-manage pki_setup"
 
+	# Activate the keystone.service
+	deb-systemd-helper unmask keystone.service >/dev/null || true
+	if deb-systemd-helper --quiet was-enabled keystone.service ; then
+		deb-systemd-helper enable keystone.service >/dev/null || true
+	else
+		deb-systemd-helper update-state keystone.service >/dev/null || true
+	fi
+
 	# Setup init script and start keystone
 	pkgos_init keystone
 
@@ -130,12 +138,4 @@
 	db_stop
 fi
 
-# Activate the keystone.service
-deb-systemd-helper unmask keystone.service >/dev/null || true
-if deb-systemd-helper --quiet was-enabled keystone.service ; then
-	deb-systemd-helper enable keystone.service >/dev/null || true
-else
-	deb-systemd-helper update-state keystone.service >/dev/null || true
-fi
-
 exit 0