Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Dear release team,
The version 16 of openstack-pkg-tools attempted to support systemd,
but it wasn't creating /var/run/<PROJECT-NAME>, and therefore, it
isn't possible to start daemons properly if using systemd in Jessie.
Version 17 corrects the problem, together with adding the possibility
to *not* use --config-file, as this is needed to fix another bug.
Please unblock openstack-pkg-tools/17.
Once this upload is approved, I'll have to proceed with uploading
updates for all OpenStack core packages, which is needed anyway to
add new Debconf translations which were sent to the BTS.
Cheers,
Thomas Goirand (zigo)
diff --git a/debian/changelog b/debian/changelog
index 84a6a18..dd170aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+openstack-pkg-tools (17) unstable; urgency=medium
+
+ * Make it possible to have no --config-file= argument for the daemon.
+ * Adds a RuntimeDirectory=/var/run/${PROJECT_NAME} in the systemd template,
+ so that /var/run/${PROJECT_NAME} can be created on boot (Closes: #767711).
+
+ -- Thomas Goirand <z...@debian.org> Wed, 29 Oct 2014 00:31:49 +0800
+
openstack-pkg-tools (16) unstable; urgency=medium
* Fix some upstart job generation handling for murano-agent.
diff --git a/init-template/init-script-template b/init-template/init-script-template
index 810fc34..0326b5d 100644
--- a/init-template/init-script-template
+++ b/init-template/init-script-template
@@ -29,7 +29,9 @@ if [ -z "${CONFIG_FILE}" ] ; then
CONFIG_FILE=/etc/${PROJECT_NAME}/${PROJECT_NAME}.conf
fi
LOGFILE=/var/log/${PROJECT_NAME}/${NAME}.log
-DAEMON_ARGS="${DAEMON_ARGS} --config-file=${CONFIG_FILE}"
+if [ -z "${NO_OPENSTACK_CONFIG_FILE_DAEMON_ARG}" ] ; then
+ DAEMON_ARGS="${DAEMON_ARGS} --config-file=${CONFIG_FILE}"
+fi
# Exit if the package is not installed
[ -x $DAEMON ] || exit 0
diff --git a/init-template/pkgos-gen-systemd-unit b/init-template/pkgos-gen-systemd-unit
index 0ce0858..8168319 100755
--- a/init-template/pkgos-gen-systemd-unit
+++ b/init-template/pkgos-gen-systemd-unit
@@ -35,6 +35,7 @@ User=${SYSTEM_USER}
Group=${SYSTEM_GROUP}
ExecStart=${SCRIPTNAME} systemd-start
ExecStop=${SCRIPTNAME} systemd-stop
+RuntimeDirectory=/var/run/${PROJECT_NAME}
PIDFile=/var/run/${PROJECT_NAME}/${NAME}.pid
Restart=on-failure
Type=forking
