+heat (2014.2~rc1-3) UNRELEASED; urgency=medium
+
+ * Now using templated init script for sysv-rc, generated systemd unit and
+ upstart jobs, using openstack-pkg-tools >= 13.
+
+ -- Thomas Goirand <zigo@debian.org> Fri, 03 Oct 2014 13:49:28 +0800
+
heat (2014.2~rc1-2) experimental; urgency=medium
* Also package /usr/bin/heat-keystone-setup-domain.
Mehdi Abaakouk <sileht@sileht.net>
Build-Depends: debhelper (>= 9),
dh-systemd,
- openstack-pkg-tools (>= 12~),
+ openstack-pkg-tools (>= 13~),
po-debconf,
python-all (>= 2.6.6-3~),
python-pbr (>= 0.6),
+++ /dev/null
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides: heat-api-cfn
-# Required-Start: $network $local_fs $remote_fs $syslog
-# Required-Stop: $remote_fs
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: Heat CFN API
-# Description: Heat CFN API server
-### END INIT INFO
-
-# Author: Thomas Goirand <zigo@debian.or>
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="Heat API"
-PROJECT_NAME=heat
-NAME=${PROJECT_NAME}-api-cfn
-DAEMON=/usr/bin/${NAME}
-DAEMON_ARGS="--config-file=/etc/${PROJECT_NAME}/${PROJECT_NAME}.conf"
-PIDFILE=/var/run/${NAME}.pid
-SCRIPTNAME=/etc/init.d/${NAME}
-SYSTEM_USER=${PROJECT_NAME}
-SYSTEM_GROUP=${PROJECT_NAME}
-LOCK_DIR=/var/lock/${PROJECT_NAME}/
-
-# Exit if the package is not installed
-[ -x $DAEMON ] || exit 0
-
-mkdir -p ${LOCK_DIR} /var/run/${PROJECT_NAME} /var/log/${PROJECT_NAME}
-chown ${SYSTEM_USER} ${LOCK_DIR} /var/run/${PROJECT_NAME} /var/log/${PROJECT_NAME}
-
-. /lib/lsb/init-functions
-
-[ -r /etc/default/openstack ] && . /etc/default/openstack
-[ -r /etc/default/${NAME} ] && . /etc/default/${NAME}
-
-[ "x$USE_SYSLOG" = "xyes" ] && DAEMON_ARGS="$DAEMON_ARGS --use-syslog"
-[ "x$USE_LOGFILE" != "xno" ] && DAEMON_ARGS="$DAEMON_ARGS --log-file=/var/log/${PROJECT_NAME}/${NAME}.log"
-
-do_start () {
- start-stop-daemon --start --background --quiet --chuid ${SYSTEM_USER}:${SYSTEM_GROUP} --make-pidfile --pidfile $PIDFILE --startas $DAEMON --test > /dev/null || return 1
- start-stop-daemon --start --background --quiet --chuid ${SYSTEM_USER}:${SYSTEM_GROUP} --make-pidfile --pidfile $PIDFILE --startas $DAEMON -- ${DAEMON_ARGS} || return 2
-}
-
-do_stop () {
- start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE
- RETVAL="$?"
- rm -f $PIDFILE
- return "$RETVAL"
-}
-
-case "$1" in
-start)
- log_daemon_msg "Starting $DESC" "$NAME"
- do_start
- case "$?" in
- 0|1) log_end_msg 0 ;;
- 2) log_end_msg 1 ;;
- esac
-;;
-stop)
- log_daemon_msg "Stopping $DESC" "$NAME"
- do_stop
- case "$?" in
- 0|1) log_end_msg 0 ;;
- 2) log_end_msg 1 ;;
- esac
-;;
-status)
- status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
-;;
-systemd-start)
- do_start
-;;
-systemd-stop)
- do_stop
-;;
-restart|force-reload)
- log_daemon_msg "Restarting $DESC" "$NAME"
- do_stop
- case "$?" in
- 0|1)
- do_start
- case "$?" in
- 0) log_end_msg 0 ;;
- 1) log_end_msg 1 ;; # Old process is still running
- *) log_end_msg 1 ;; # Failed to start
- esac
- ;;
- *)
- # Failed to stop
- log_end_msg 1
- ;;
- esac
-;;
-*)
- echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
- exit 3
-;;
-esac
-
-exit 0
--- /dev/null
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides: heat-api-cfn
+# Required-Start: $network $local_fs $remote_fs $syslog
+# Required-Stop: $remote_fs
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: Heat CFN API
+# Description: Heat CFN API server
+### END INIT INFO
+
+# Author: Thomas Goirand <zigo@debian.or>
+
+# PATH should only include /usr/* if it runs after the mountnfs.sh script
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="Heat API"
+PROJECT_NAME=heat
+NAME=${PROJECT_NAME}-api-cfn
+++ /dev/null
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides: heat-api-cloudwatch
-# Required-Start: $network $local_fs $remote_fs $syslog
-# Required-Stop: $remote_fs
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: Heat cloudwatch API
-# Description: Heat cloudwatch API server
-### END INIT INFO
-
-# Author: Thomas Goirand <zigo@debian.or>
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="Heat API"
-PROJECT_NAME=heat
-NAME=${PROJECT_NAME}-api-cloudwatch
-DAEMON=/usr/bin/${NAME}
-DAEMON_ARGS="--config-file=/etc/${PROJECT_NAME}/${PROJECT_NAME}.conf"
-PIDFILE=/var/run/${PROJECT_NAME}/${NAME}.pid
-SCRIPTNAME=/etc/init.d/${NAME}
-SYSTEM_USER=${PROJECT_NAME}
-SYSTEM_GROUP=${PROJECT_NAME}
-LOCK_DIR=/var/lock/${PROJECT_NAME}/
-
-# Exit if the package is not installed
-[ -x $DAEMON ] || exit 0
-
-. /lib/lsb/init-functions
-
-mkdir -p ${LOCK_DIR} /var/run/${PROJECT_NAME} /var/log/${PROJECT_NAME}
-chown ${SYSTEM_USER} ${LOCK_DIR} /var/run/${PROJECT_NAME} /var/log/${PROJECT_NAME}
-
-[ -r /etc/default/openstack ] && . /etc/default/openstack
-[ -r /etc/default/$NAME ] && . /etc/default/$NAME
-
-[ "x$USE_SYSLOG" = "xyes" ] && DAEMON_ARGS="$DAEMON_ARGS --use-syslog"
-[ "x$USE_LOGFILE" != "xno" ] && DAEMON_ARGS="$DAEMON_ARGS --log-file=/var/log/${PROJECT_NAME}/${NAME}.log"
-
-do_start () {
- start-stop-daemon --start --background --quiet --chuid ${SYSTEM_USER}:${SYSTEM_USER} --make-pidfile --pidfile $PIDFILE --startas $DAEMON --test > /dev/null || return 1
- start-stop-daemon --start --background --quiet --chuid ${SYSTEM_USER}:${SYSTEM_USER} --make-pidfile --pidfile $PIDFILE --startas $DAEMON -- ${DAEMON_ARGS} || return 2
-}
-
-do_stop () {
- start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE
- RETVAL="$?"
- rm -f $PIDFILE
- return "$RETVAL"
-}
-
-case "$1" in
-start)
- log_daemon_msg "Starting $DESC" "$NAME"
- do_start
- case "$?" in
- 0|1) log_end_msg 0 ;;
- 2) log_end_msg 1 ;;
- esac
-;;
-stop)
- log_daemon_msg "Stopping $DESC" "$NAME"
- do_stop
- case "$?" in
- 0|1) log_end_msg 0 ;;
- 2) log_end_msg 1 ;;
- esac
-;;
-status)
- status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
-;;
-systemd-start)
- do_start
-;;
-systemd-stop)
- do_stop
-;;
-restart|force-reload)
- log_daemon_msg "Restarting $DESC" "$NAME"
- do_stop
- case "$?" in
- 0|1)
- do_start
- case "$?" in
- 0) log_end_msg 0 ;;
- 1) log_end_msg 1 ;; # Old process is still running
- *) log_end_msg 1 ;; # Failed to start
- esac
- ;;
- *)
- # Failed to stop
- log_end_msg 1
- ;;
- esac
-;;
-*)
- echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
- exit 3
-;;
-esac
--- /dev/null
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides: heat-api-cloudwatch
+# Required-Start: $network $local_fs $remote_fs $syslog
+# Required-Stop: $remote_fs
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: Heat cloudwatch API
+# Description: Heat cloudwatch API server
+### END INIT INFO
+
+# Author: Thomas Goirand <zigo@debian.or>
+
+# PATH should only include /usr/* if it runs after the mountnfs.sh script
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="Heat API"
+PROJECT_NAME=heat
+NAME=${PROJECT_NAME}-api-cloudwatch
+++ /dev/null
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides: heat-api
-# Required-Start: $network $local_fs $remote_fs $syslog
-# Required-Stop: $remote_fs
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: Heat API
-# Description: Heat API server
-### END INIT INFO
-
-# Author: Thomas Goirand <zigo@debian.or>
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="Heat API"
-PROJECT_NAME=heat
-NAME=${PROJECT_NAME}-api
-DAEMON=/usr/bin/${NAME}
-DAEMON_ARGS="--config-file=/etc/${PROJECT_NAME}/${PROJECT_NAME}.conf"
-PIDFILE=/var/run/${PROJECT_NAME}/${NAME}.pid
-SCRIPTNAME=/etc/init.d/${NAME}
-SYSTEM_USER=${PROJECT_NAME}
-SYSTEM_GROUP=${PROJECT_NAME}
-LOCK_DIR=/var/lock/${PROJECT_NAME}/
-
-# Exit if the package is not installed
-[ -x $DAEMON ] || exit 0
-
-mkdir -p ${LOCK_DIR} /var/run/${PROJECT_NAME} /var/log/${PROJECT_NAME}
-chown ${SYSTEM_USER} ${LOCK_DIR} /var/run/${PROJECT_NAME} /var/log/${PROJECT_NAME}
-
-. /lib/lsb/init-functions
-
-# Manage log options
-[ -r /etc/default/openstack ] && . /etc/default/openstack
-[ -r /etc/default/$NAME ] && . /etc/default/$NAME
-[ "x$USE_SYSLOG" = "xyes" ] && DAEMON_ARGS="$DAEMON_ARGS --use-syslog"
-[ "x$USE_LOGFILE" != "xno" ] && DAEMON_ARGS="$DAEMON_ARGS --log-file=/var/log/${PROJECT_NAME}/${NAME}.log"
-
-do_start () {
- start-stop-daemon --start --background --quiet --chuid ${SYSTEM_USER}:${SYSTEM_USER} --make-pidfile --pidfile $PIDFILE --startas $DAEMON --test > /dev/null || return 1
- start-stop-daemon --start --background --quiet --chuid ${SYSTEM_USER}:${SYSTEM_USER} --make-pidfile --pidfile $PIDFILE --startas $DAEMON -- ${DAEMON_ARGS} || return 2
-}
-
-do_stop () {
- start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE
- RETVAL="$?"
- rm -f $PIDFILE
- return "$RETVAL"
-}
-
-case "$1" in
-start)
- log_daemon_msg "Starting $DESC" "$NAME"
- do_start
- case "$?" in
- 0|1) log_end_msg 0 ;;
- 2) log_end_msg 1 ;;
- esac
-;;
-stop)
- log_daemon_msg "Stopping $DESC" "$NAME"
- do_stop
- case "$?" in
- 0|1) log_end_msg 0 ;;
- 2) log_end_msg 1 ;;
- esac
-;;
-status)
- status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
-;;
-systemd-start)
- do_start
-;;
-systemd-stop)
- do_stop
-;;
-restart|force-reload)
- log_daemon_msg "Restarting $DESC" "$NAME"
- do_stop
- case "$?" in
- 0|1)
- do_start
- case "$?" in
- 0) log_end_msg 0 ;;
- 1) log_end_msg 1 ;; # Old process is still running
- *) log_end_msg 1 ;; # Failed to start
- esac
- ;;
- *)
- # Failed to stop
- log_end_msg 1
- ;;
- esac
-;;
-*)
- echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
- exit 3
-;;
-esac
-
-exit 0
--- /dev/null
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides: heat-api
+# Required-Start: $network $local_fs $remote_fs $syslog
+# Required-Stop: $remote_fs
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: Heat API
+# Description: Heat API server
+### END INIT INFO
+
+# Author: Thomas Goirand <zigo@debian.or>
+
+# PATH should only include /usr/* if it runs after the mountnfs.sh script
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="Heat API"
+PROJECT_NAME=heat
+NAME=${PROJECT_NAME}-api
+++ /dev/null
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides: heat-engine
-# Required-Start: $network $local_fs $remote_fs $syslog
-# Required-Stop: $remote_fs
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: Heat Engine
-# Description: Heat Engine server
-### END INIT INFO
-
-# Author: Thomas Goirand <zigo@debian.or>
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="Heat Engine"
-PROJECT_NAME=heat
-NAME=${PROJECT_NAME}-engine
-DAEMON=/usr/bin/${NAME}
-DAEMON_ARGS="--config-file=/etc/${PROJECT_NAME}/${PROJECT_NAME}.conf"
-PIDFILE=/var/run/${PROJECT_NAME}/${NAME}.pid
-SCRIPTNAME=/etc/init.d/${NAME}
-SYSTEM_USER=${PROJECT_NAME}
-SYSTEM_GROUP=${PROJECT_NAME}
-LOCK_DIR=/var/lock/${PROJECT_NAME}/
-
-# Exit if the package is not installed
-[ -x $DAEMON ] || exit 0
-
-mkdir -p ${LOCK_DIR} /var/run/${PROJECT_NAME} /var/log/${PROJECT_NAME}
-chown ${SYSTEM_USER} ${LOCK_DIR} /var/run/${PROJECT_NAME} /var/log/${PROJECT_NAME}
-
-. /lib/lsb/init-functions
-
-# Manage log options
-[ -r /etc/default/openstack ] && . /etc/default/openstack
-[ -r /etc/default/$NAME ] && . /etc/default/$NAME
-[ "x$USE_SYSLOG" = "xyes" ] && DAEMON_ARGS="$DAEMON_ARGS --use-syslog"
-[ "x$USE_LOGFILE" != "xno" ] && DAEMON_ARGS="$DAEMON_ARGS --log-file=/var/log/${PROJECT_NAME}/${NAME}.log"
-
-do_start () {
- start-stop-daemon --start --background --quiet --chuid ${SYSTEM_USER}:${SYSTEM_USER} --make-pidfile --pidfile $PIDFILE --startas $DAEMON --test > /dev/null || return 1
- start-stop-daemon --start --background --quiet --chuid ${SYSTEM_USER}:${SYSTEM_USER} --make-pidfile --pidfile $PIDFILE --startas $DAEMON -- ${DAEMON_ARGS} || return 2
-}
-
-do_stop () {
- start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE
- RETVAL="$?"
- rm -f $PIDFILE
- return "$RETVAL"
-}
-
-case "$1" in
-start)
- log_daemon_msg "Starting $DESC" "$NAME"
- do_start
- case "$?" in
- 0|1) log_end_msg 0 ;;
- 2) log_end_msg 1 ;;
- esac
-;;
-stop)
- log_daemon_msg "Stopping $DESC" "$NAME"
- do_stop
- case "$?" in
- 0|1) log_end_msg 0 ;;
- 2) log_end_msg 1 ;;
- esac
-;;
-status)
- status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
-;;
-systemd-start)
- do_start
-;;
-systemd-stop)
- do_stop
-;;
-restart|force-reload)
- log_daemon_msg "Restarting $DESC" "$NAME"
- do_stop
- case "$?" in
- 0|1)
- do_start
- case "$?" in
- 0) log_end_msg 0 ;;
- 1) log_end_msg 1 ;; # Old process is still running
- *) log_end_msg 1 ;; # Failed to start
- esac
- ;;
- *)
- # Failed to stop
- log_end_msg 1
- ;;
- esac
-;;
-*)
- echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
- exit 3
-;;
-esac
--- /dev/null
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides: heat-engine
+# Required-Start: $network $local_fs $remote_fs $syslog
+# Required-Stop: $remote_fs
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: Heat Engine
+# Description: Heat Engine server
+### END INIT INFO
+
+# Author: Thomas Goirand <zigo@debian.or>
+
+# PATH should only include /usr/* if it runs after the mountnfs.sh script
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="Heat Engine"
+PROJECT_NAME=heat
+NAME=${PROJECT_NAME}-engine
export OSLO_PACKAGE_VERSION=$(VERSION)
%:
- dh $@ --buildsystem=python_distutils --with python2,sphinxdoc
+ dh $@ --buildsystem=python_distutils --with python2,sphinxdoc,systemd
ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
override_dh_auto_test:
rm -f \
debian/heat-common.postinst \
debian/heat-common.config
+ rm -f debian/*.init debian/*.service debian/*.upstart
override_dh_install:
dh_install --fail-missing -Xbin/cinder-keystone-setup
Code Review / openstack-build / heat-build.git / commitdiff