Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Hi,
My last upload of Keystone fixes a few bugs which I would like to get rid of
for Jessie, including:
- Fix for Systemd startup
- Inclusion of keystone.cron.hourly (very important in production)
- Only managed the db with dbconfig-common if asked in Debconf.
- Remove of python-bashate as build-depends.
Debdiff attached.
Please unblock keystone/2014.1.3-4
Cheers,
Thomas Goirand (zigo)
diff -Nru keystone-2014.1.3/debian/changelog keystone-2014.1.3/debian/changelog
--- keystone-2014.1.3/debian/changelog 2014-10-07 07:54:16.000000000 +0000
+++ keystone-2014.1.3/debian/changelog 2014-12-18 11:07:23.000000000 +0000
@@ -1,3 +1,19 @@
+keystone (2014.1.3-4) unstable; urgency=medium
+
+ * Manually activates keystone.service since we're not using #DEBHELPER#.
+ * Now requires version >= 20~ of openstack-pkg-tools to build
+ (Closes: #770706).
+ * Added missing debian/keystone.cron.hourly to flush the token table
+ periodically, otherwise the table can grow up to gigabytes and Keystone
+ becomes unusable.
+ * Removed python-bashate build-depends.
+ * Only run pkgos_dbc_postinst if asked by user.
+ * Do not run 'tests\.(?!.*KcMaster.*)' unit tests which are failing because
+ they are adapted for a newer version of keystoneclient with
+ oslo.serialization which isn't in Jessie.
+
+ -- Thomas Goirand <z...@debian.org> Mon, 15 Dec 2014 14:12:57 +0800
+
keystone (2014.1.3-2) unstable; urgency=medium
* Mangling upstream rc and beta versions in watch file.
diff -Nru keystone-2014.1.3/debian/control keystone-2014.1.3/debian/control
--- keystone-2014.1.3/debian/control 2014-10-07 07:54:16.000000000 +0000
+++ keystone-2014.1.3/debian/control 2014-12-18 11:07:23.000000000 +0000
@@ -7,13 +7,12 @@
Mehdi Abaakouk <sil...@sileht.net>
Build-Depends: debhelper (>= 9),
dh-systemd,
- openstack-pkg-tools (>= 14~),
+ openstack-pkg-tools (>= 20~),
po-debconf,
python-all (>= 2.6.6-3~),
python-pbr (>= 0.6),
python-sphinx
-Build-Depends-Indep: python-bashate,
- pep8 (>= 1.3.3),
+Build-Depends-Indep: pep8 (>= 1.3.3),
pylint,
python-all-dev (>= 2.6.6-3~) | python-support,
python-babel (>= 1.3),
@@ -131,6 +130,7 @@
Pre-Depends: dpkg (>= 1.15.6~)
Depends: adduser,
dbconfig-common,
+ init-system-helpers (>= 1.18~),
python-configobj,
python-keystone (= ${source:Version}),
sqlite3,
diff -Nru keystone-2014.1.3/debian/keystone.cron.hourly keystone-2014.1.3/debian/keystone.cron.hourly
--- keystone-2014.1.3/debian/keystone.cron.hourly 1970-01-01 00:00:00.000000000 +0000
+++ keystone-2014.1.3/debian/keystone.cron.hourly 2014-12-18 11:07:23.000000000 +0000
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+set -e
+
+su -c '/usr/bin/keystone-manage token_flush >/var/log/keystone/keystone-tokenflush.log 2>&1' keystone
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 2014-10-07 07:54:16.000000000 +0000
+++ keystone-2014.1.3/debian/keystone.postinst.in 2014-12-18 11:07:23.000000000 +0000
@@ -79,8 +79,6 @@
AUTH_TOKEN=`pkgos_gen_pass`
fi
pkgos_inifile set ${KEY_CONF} DEFAULT admin_token ${AUTH_TOKEN}
- # Configure the SQL connection of keystone.conf according to dbconfig-common
- pkgos_dbc_postinst ${KEY_CONF} database connection keystone $@
# Make sure /var/log/keystone/keystone.log is owned by keystone
# BEFORE any keystone-manage calls.
@@ -89,6 +87,8 @@
# Upgrade or create the db if directed to do so
db_get keystone/configure_db
if [ "$RET" = "true" ] && [ "$dbc_upgrade" = "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"
fi
@@ -130,4 +130,12 @@
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
diff -Nru keystone-2014.1.3/debian/rules keystone-2014.1.3/debian/rules
--- keystone-2014.1.3/debian/rules 2014-10-07 07:54:16.000000000 +0000
+++ keystone-2014.1.3/debian/rules 2014-12-18 11:07:23.000000000 +0000
@@ -17,7 +17,7 @@
override_dh_auto_test:
mkdir -p $(CURDIR)/keystone/tests/tmp
patch -p1 -R <debian/patches/fixes-default-connection.patch
- ./run_tests.sh -N -P || true
+ ./run_tests.sh -N -P 'tests\.(?!.*KcMaster.*)' || true
patch -p1 <debian/patches/fixes-default-connection.patch
endif
