From: Thomas Goirand Date: Fri, 3 Oct 2014 04:48:48 +0000 (+0800) Subject: * Added missing binaries. X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=8253c29f42f5ce273b151b4df22ba746de91dd68;p=openstack-build%2Fceilometer-build.git * Added missing binaries. * Now packaging ceilometer-agent-ipmi. * Using templated init, upstart and systemd scripts from openstack-pkg-tools >= 13. Change-Id: Id3f9e91ae620cfa62f27e4f07202f6ee89652ea6 Rewritten-From: 9fb03437a77a9304c75a5923f72e7a721af1a132 --- diff --git a/trusty/debian/ceilometer-agent-central.init b/trusty/debian/ceilometer-agent-central.init deleted file mode 100644 index e944f8f..0000000 --- a/trusty/debian/ceilometer-agent-central.init +++ /dev/null @@ -1,112 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: ceilometer-agent-central -# Required-Start: $network $local_fs $remote_fs $syslog -# Required-Stop: $remote_fs -# Should-Start: mongodb rabbitmq-server -# Should-Stop: mongodb rabbitmq-server -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: ceilometer central agent -# Description: ceilometer central agent -### END INIT INFO - -# Author: Thomas Goirand - -PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC="Ceilometer Agent Central" -SYS_NAME=ceilometer -NAME=ceilometer-agent-central -DAEMON=/usr/bin/ceilometer-agent-central - -SCRIPTNAME=/etc/init.d/${NAME} -DAEMON_USER=${SYS_NAME} -DAEMON_GROUP=${SYS_NAME} -LOCK_DIR=/var/lock/${SYS_NAME} -PID_DIR=/var/run/${SYS_NAME} -PID_FILE=${PID_DIR}/${NAME}.pid -LOGFILE=/var/log/${SYS_NAME}/${NAME}.log -DAEMON_ARGS="--config-file=/etc/${SYS_NAME}/ceilometer.conf" - -[ -x $DAEMON ] || exit 0 - -for i in ${LOCK_DIR} ${PID_DIR} ; do - [ ! -d ${i} ] && mkdir -p ${i} - [ -d ${i} ] && chown ${DAEMON_USER}:${DAEMON_GROUP} ${i} -done - -. /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=$LOGFILE" - -do_start() { - start-stop-daemon --start \ - --background --quiet \ - --chuid ${DAEMON_USER}:${DAEMON_GROUP} \ - --make-pidfile --pidfile ${PID_FILE} \ - --chdir /var/run \ - --startas $DAEMON \ - --test > /dev/null \ - || return 1 - start-stop-daemon --start \ - --background --quiet \ - --chuid ${DAEMON_USER}:${DAEMON_GROUP} \ - --make-pidfile --pidfile ${PID_FILE} \ - --chdir /var/run \ - --startas $DAEMON -- $DAEMON_ARGS \ - || return 2 -} - -do_stop() { - start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PID_FILE - RETVAL=$? - rm -f $PID_FILE - 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 $? -;; -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 - ;; - *) log_end_msg 1 ;; # Failed to stop - esac -;; -*) - echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 - exit 3 -;; -esac - -exit 0 diff --git a/trusty/debian/ceilometer-agent-central.init.in b/trusty/debian/ceilometer-agent-central.init.in new file mode 100644 index 0000000..3c1bd16 --- /dev/null +++ b/trusty/debian/ceilometer-agent-central.init.in @@ -0,0 +1,19 @@ +#!/bin/sh +### BEGIN INIT INFO +# Provides: ceilometer-agent-central +# Required-Start: $network $local_fs $remote_fs $syslog +# Required-Stop: $remote_fs +# Should-Start: mongodb rabbitmq-server +# Should-Stop: mongodb rabbitmq-server +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: ceilometer central agent +# Description: ceilometer central agent +### END INIT INFO + +# Author: Thomas Goirand + +PATH=/sbin:/usr/sbin:/bin:/usr/bin +DESC="Ceilometer Agent Central" +PROJECT_NAME=ceilometer +NAME=${PROJECT_NAME}-agent-central diff --git a/trusty/debian/ceilometer-agent-central.upstart.in b/trusty/debian/ceilometer-agent-central.upstart.in deleted file mode 100644 index 44319bd..0000000 --- a/trusty/debian/ceilometer-agent-central.upstart.in +++ /dev/null @@ -1,25 +0,0 @@ -description "ceilometer-agent-central" -author "Chuck Short " - -start on runlevel [2345] -stop on runlelvel [016] - -chdir /var/run - -pre-start script - mkdir -p /var/run/ceilometer - chown ceilometer:ceilometer /var/run/ceilometer - - mkdir -p /var/lock/ceilometer - chown ceilometer:ceilometer /var/lock/ceilometer -end script - -script - [ -r /etc/default/openstack ] && . /etc/default/openstack - [ -r /etc/default/$UPSTART_JOB ] && . /etc/default/$UPSTART_JOB - - [ "x$USE_SYSLOG" = "xyes" ] && DAEMON_ARGS="$DAEMON_ARGS --use-syslog" - [ "x$USE_LOGFILE" != "xno" ] && DAEMON_ARGS="$DAEMON_ARGS --log-file /var/log/ceilometer/$UPSTART_JOB.log" - - exec su -s /bin/sh -c "exec ceilometer-agent-central --config-file /etc/ceilometer/ceilometer.conf $DAEMON_ARGS" ceilometer -end script diff --git a/trusty/debian/ceilometer-agent-compute.init b/trusty/debian/ceilometer-agent-compute.init deleted file mode 100644 index 0b9ef93..0000000 --- a/trusty/debian/ceilometer-agent-compute.init +++ /dev/null @@ -1,112 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: ceilometer-agent-compute -# Required-Start: $network $local_fs $remote_fs $syslog -# Required-Stop: $remote_fs -# Should-Start: mongodb rabbitmq-server -# Should-Stop: mongodb rabbitmq-server -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: ceilometer central compute -# Description: ceilometer central compute -### END INIT INFO - -# Author: Thomas Goirand - -PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC="Ceilometer Agent Compute" -SYS_NAME=ceilometer -NAME=ceilometer-agent-compute -DAEMON=/usr/bin/ceilometer-agent-compute - -SCRIPTNAME=/etc/init.d/${NAME} -DAEMON_USER=${SYS_NAME} -DAEMON_GROUP=${SYS_NAME} -LOCK_DIR=/var/lock/${SYS_NAME} -PID_DIR=/var/run/${SYS_NAME} -PID_FILE=${PID_DIR}/${NAME}.pid -LOGFILE=/var/log/${SYS_NAME}/${NAME}.log -DAEMON_ARGS="--config-file=/etc/${SYS_NAME}/ceilometer.conf" - -[ -x $DAEMON ] || exit 0 - -for i in ${LOCK_DIR} ${PID_DIR} ; do - [ ! -d ${i} ] && mkdir -p ${i} - [ -d ${i} ] && chown ${DAEMON_USER}:${DAEMON_GROUP} ${i} -done - -. /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=$LOGFILE" - -do_start() { - start-stop-daemon --start \ - --background --quiet \ - --chuid ${DAEMON_USER}:${DAEMON_GROUP} \ - --make-pidfile --pidfile ${PID_FILE} \ - --chdir /var/run \ - --startas $DAEMON \ - --test > /dev/null \ - || return 1 - start-stop-daemon --start \ - --background --quiet \ - --chuid ${DAEMON_USER}:${DAEMON_GROUP} \ - --make-pidfile --pidfile ${PID_FILE} \ - --chdir /var/run \ - --startas $DAEMON -- $DAEMON_ARGS \ - || return 2 -} - -do_stop() { - start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PID_FILE - RETVAL=$? - rm -f $PID_FILE - 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 $? -;; -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 - ;; - *) log_end_msg 1 ;; # Failed to stop - esac -;; -*) - echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 - exit 3 -;; -esac - -exit 0 diff --git a/trusty/debian/ceilometer-agent-compute.init.in b/trusty/debian/ceilometer-agent-compute.init.in new file mode 100644 index 0000000..95f619d --- /dev/null +++ b/trusty/debian/ceilometer-agent-compute.init.in @@ -0,0 +1,19 @@ +#!/bin/sh +### BEGIN INIT INFO +# Provides: ceilometer-agent-compute +# Required-Start: $network $local_fs $remote_fs $syslog +# Required-Stop: $remote_fs +# Should-Start: mongodb rabbitmq-server +# Should-Stop: mongodb rabbitmq-server +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: ceilometer central compute +# Description: ceilometer central compute +### END INIT INFO + +# Author: Thomas Goirand + +PATH=/sbin:/usr/sbin:/bin:/usr/bin +DESC="Ceilometer Agent Compute" +PROJECT_NAME=ceilometer +NAME=${PROJECT_NAME}-agent-compute diff --git a/trusty/debian/ceilometer-agent-ipmi.init.in b/trusty/debian/ceilometer-agent-ipmi.init.in new file mode 100644 index 0000000..2c03df7 --- /dev/null +++ b/trusty/debian/ceilometer-agent-ipmi.init.in @@ -0,0 +1,20 @@ +#!/bin/sh +### BEGIN INIT INFO +# Provides: ceilometer-agent-ipmi +# Required-Start: $network $local_fs $remote_fs $syslog +# Required-Stop: $remote_fs +# Should-Start: postgresql mysql keystone rabbitmq-server ntp +# Should-Stop: postgresql mysql keystone rabbitmq-server ntp +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Ceilometer Agent IPMI +# Description: Ceilometer Agent IPMI +### END INIT INFO + +# Author: Thomas Goirand + +# PATH should only include /usr/* if it runs after the mountnfs.sh script +PATH=/sbin:/usr/sbin:/bin:/usr/bin +DESC="Ceilometer Agent IPMI" +PROJECT_NAME=ceilometer +NAME=${PROJECT_NAME}-agent-ipmi diff --git a/trusty/debian/ceilometer-agent-ipmi.install b/trusty/debian/ceilometer-agent-ipmi.install new file mode 100644 index 0000000..e341377 --- /dev/null +++ b/trusty/debian/ceilometer-agent-ipmi.install @@ -0,0 +1 @@ +usr/bin/ceilometer-agent-ipmi diff --git a/trusty/debian/ceilometer-agent-ipmi.logrotate b/trusty/debian/ceilometer-agent-ipmi.logrotate new file mode 100644 index 0000000..0ba9cee --- /dev/null +++ b/trusty/debian/ceilometer-agent-ipmi.logrotate @@ -0,0 +1,8 @@ +/var/log/ceilometer/ceilometer-agent-ipmi.log { + daily + missingok + compress + delaycompress + notifempty + copytruncate +} diff --git a/trusty/debian/ceilometer-agent-ipmi.postrm b/trusty/debian/ceilometer-agent-ipmi.postrm new file mode 100644 index 0000000..d43d6ba --- /dev/null +++ b/trusty/debian/ceilometer-agent-ipmi.postrm @@ -0,0 +1,12 @@ +#!/bin/sh + +set -e + +if [ "${1}" = purge ] ; then + rm -f /var/log/ceilometer/ceilometer-agent-ipmi.log* + [ -d /var/log/ceilometer ] && rmdir --ignore-fail-on-non-empty /var/log/ceilometer +fi + +#DEBHELPER# + +exit 0 diff --git a/trusty/debian/ceilometer-agent-notification.init b/trusty/debian/ceilometer-agent-notification.init deleted file mode 100644 index 876e6e7..0000000 --- a/trusty/debian/ceilometer-agent-notification.init +++ /dev/null @@ -1,112 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: ceilometer-agent-notification -# Required-Start: $network $local_fs $remote_fs $syslog -# Required-Stop: $remote_fs -# Should-Start: mongodb rabbitmq-server -# Should-Stop: mongodb rabbitmq-server -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: ceilometer agent notification -# Description: ceilometer agent notification -### END INIT INFO - -# Author: Thomas Goirand - -PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC="Ceilometer Notification Agent" -SYS_NAME=ceilometer -NAME=ceilometer-agent-notification -DAEMON=/usr/bin/${NAME} - -SCRIPTNAME=/etc/init.d/${NAME} -DAEMON_USER=${SYS_NAME} -DAEMON_GROUP=${SYS_NAME} -LOCK_DIR=/var/lock/${SYS_NAME} -PID_DIR=/var/run/${SYS_NAME} -PID_FILE=${PID_DIR}/${NAME}.pid -LOGFILE=/var/log/${SYS_NAME}/${NAME}.log -DAEMON_ARGS="--config-file=/etc/${SYS_NAME}/ceilometer.conf" - -[ -x $DAEMON ] || exit 0 - -for i in ${LOCK_DIR} ${PID_DIR} ; do - [ ! -d ${i} ] && mkdir -p ${i} - [ -d ${i} ] && chown ${DAEMON_USER}:${DAEMON_GROUP} ${i} -done - -. /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=$LOGFILE" - -do_start() { - start-stop-daemon --start \ - --background --quiet \ - --chuid ${DAEMON_USER}:${DAEMON_GROUP} \ - --make-pidfile --pidfile ${PID_FILE} \ - --chdir /var/run \ - --startas $DAEMON \ - --test > /dev/null \ - || return 1 - start-stop-daemon --start \ - --background --quiet \ - --chuid ${DAEMON_USER}:${DAEMON_GROUP} \ - --make-pidfile --pidfile ${PID_FILE} \ - --chdir /var/run \ - --startas $DAEMON -- $DAEMON_ARGS \ - || return 2 -} - -do_stop() { - start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PID_FILE - RETVAL=$? - rm -f $PID_FILE - 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 $? -;; -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 - ;; - *) log_end_msg 1 ;; # Failed to stop - esac -;; -*) - echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 - exit 3 -;; -esac - -exit 0 diff --git a/trusty/debian/ceilometer-agent-notification.init.in b/trusty/debian/ceilometer-agent-notification.init.in new file mode 100644 index 0000000..57eec2f --- /dev/null +++ b/trusty/debian/ceilometer-agent-notification.init.in @@ -0,0 +1,19 @@ +#!/bin/sh +### BEGIN INIT INFO +# Provides: ceilometer-agent-notification +# Required-Start: $network $local_fs $remote_fs $syslog +# Required-Stop: $remote_fs +# Should-Start: mongodb rabbitmq-server +# Should-Stop: mongodb rabbitmq-server +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: ceilometer agent notification +# Description: ceilometer agent notification +### END INIT INFO + +# Author: Thomas Goirand + +PATH=/sbin:/usr/sbin:/bin:/usr/bin +DESC="Ceilometer Notification Agent" +PROJECT_NAME=ceilometer +NAME=${PROJECT_NAME}-agent-notification diff --git a/trusty/debian/ceilometer-alarm-evaluator.init b/trusty/debian/ceilometer-alarm-evaluator.init deleted file mode 100644 index 4aebafb..0000000 --- a/trusty/debian/ceilometer-alarm-evaluator.init +++ /dev/null @@ -1,112 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: ceilometer-alarm-evaluator -# Required-Start: $network $local_fs $remote_fs $syslog -# Required-Stop: $remote_fs -# Should-Start: mongodb rabbitmq-server -# Should-Stop: mongodb rabbitmq-server -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: ceilometer alarm evaluator -# Description: ceilometer alarm evaluator -### END INIT INFO - -# Author: Thomas Goirand - -PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC="Ceilometer Alarm Evaluator" -SYS_NAME=ceilometer -NAME=ceilometer-alarm-evaluator -DAEMON=/usr/bin/${NAME} - -SCRIPTNAME=/etc/init.d/${NAME} -DAEMON_USER=${SYS_NAME} -DAEMON_GROUP=${SYS_NAME} -LOCK_DIR=/var/lock/${SYS_NAME} -PID_DIR=/var/run/${SYS_NAME} -PID_FILE=${PID_DIR}/${NAME}.pid -LOGFILE=/var/log/${SYS_NAME}/${NAME}.log -DAEMON_ARGS="--config-file=/etc/${SYS_NAME}/ceilometer.conf" - -[ -x $DAEMON ] || exit 0 - -for i in ${LOCK_DIR} ${PID_DIR} ; do - [ ! -d ${i} ] && mkdir -p ${i} - [ -d ${i} ] && chown ${DAEMON_USER}:${DAEMON_GROUP} ${i} -done - -. /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=$LOGFILE" - -do_start() { - start-stop-daemon --start \ - --background --quiet \ - --chuid ${DAEMON_USER}:${DAEMON_GROUP} \ - --make-pidfile --pidfile ${PID_FILE} \ - --chdir /var/run \ - --startas $DAEMON \ - --test > /dev/null \ - || return 1 - start-stop-daemon --start \ - --background --quiet \ - --chuid ${DAEMON_USER}:${DAEMON_GROUP} \ - --make-pidfile --pidfile ${PID_FILE} \ - --chdir /var/run \ - --startas $DAEMON -- $DAEMON_ARGS \ - || return 2 -} - -do_stop() { - start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PID_FILE - RETVAL=$? - rm -f $PID_FILE - 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 $? -;; -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 - ;; - *) log_end_msg 1 ;; # Failed to stop - esac -;; -*) - echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 - exit 3 -;; -esac - -exit 0 diff --git a/trusty/debian/ceilometer-alarm-evaluator.init.in b/trusty/debian/ceilometer-alarm-evaluator.init.in new file mode 100644 index 0000000..051bae7 --- /dev/null +++ b/trusty/debian/ceilometer-alarm-evaluator.init.in @@ -0,0 +1,19 @@ +#!/bin/sh +### BEGIN INIT INFO +# Provides: ceilometer-alarm-evaluator +# Required-Start: $network $local_fs $remote_fs $syslog +# Required-Stop: $remote_fs +# Should-Start: mongodb rabbitmq-server +# Should-Stop: mongodb rabbitmq-server +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: ceilometer alarm evaluator +# Description: ceilometer alarm evaluator +### END INIT INFO + +# Author: Thomas Goirand + +PATH=/sbin:/usr/sbin:/bin:/usr/bin +DESC="Ceilometer Alarm Evaluator" +PROJECT_NAME=ceilometer +NAME=${PROJECT_NAME}-alarm-evaluator diff --git a/trusty/debian/ceilometer-alarm-notifier.init b/trusty/debian/ceilometer-alarm-notifier.init deleted file mode 100644 index 8173cc8..0000000 --- a/trusty/debian/ceilometer-alarm-notifier.init +++ /dev/null @@ -1,112 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: ceilometer-alarm-notifier -# Required-Start: $network $local_fs $remote_fs $syslog -# Required-Stop: $remote_fs -# Should-Start: mongodb rabbitmq-server -# Should-Stop: mongodb rabbitmq-server -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: ceilometer alarm notifier -# Description: ceilometer alarm notifier -### END INIT INFO - -# Author: Thomas Goirand - -PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC="Ceilometer Alarm Notifier" -SYS_NAME=ceilometer -NAME=ceilometer-alarm-notifier -DAEMON=/usr/bin/${NAME} - -SCRIPTNAME=/etc/init.d/${NAME} -DAEMON_USER=${SYS_NAME} -DAEMON_GROUP=${SYS_NAME} -LOCK_DIR=/var/lock/${SYS_NAME} -PID_DIR=/var/run/${SYS_NAME} -PID_FILE=${PID_DIR}/${NAME}.pid -LOGFILE=/var/log/${SYS_NAME}/${NAME}.log -DAEMON_ARGS="--config-file=/etc/${SYS_NAME}/ceilometer.conf" - -[ -x $DAEMON ] || exit 0 - -for i in ${LOCK_DIR} ${PID_DIR} ; do - [ ! -d ${i} ] && mkdir -p ${i} - [ -d ${i} ] && chown ${DAEMON_USER}:${DAEMON_GROUP} ${i} -done - -. /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=$LOGFILE" - -do_start() { - start-stop-daemon --start \ - --background --quiet \ - --chuid ${DAEMON_USER}:${DAEMON_GROUP} \ - --make-pidfile --pidfile ${PID_FILE} \ - --chdir /var/run \ - --startas $DAEMON \ - --test > /dev/null \ - || return 1 - start-stop-daemon --start \ - --background --quiet \ - --chuid ${DAEMON_USER}:${DAEMON_GROUP} \ - --make-pidfile --pidfile ${PID_FILE} \ - --chdir /var/run \ - --startas $DAEMON -- $DAEMON_ARGS \ - || return 2 -} - -do_stop() { - start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PID_FILE - RETVAL=$? - rm -f $PID_FILE - 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 $? -;; -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 - ;; - *) log_end_msg 1 ;; # Failed to stop - esac -;; -*) - echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 - exit 3 -;; -esac - -exit 0 diff --git a/trusty/debian/ceilometer-alarm-notifier.init.in b/trusty/debian/ceilometer-alarm-notifier.init.in new file mode 100644 index 0000000..d9304c1 --- /dev/null +++ b/trusty/debian/ceilometer-alarm-notifier.init.in @@ -0,0 +1,19 @@ +#!/bin/sh +### BEGIN INIT INFO +# Provides: ceilometer-alarm-notifier +# Required-Start: $network $local_fs $remote_fs $syslog +# Required-Stop: $remote_fs +# Should-Start: mongodb rabbitmq-server +# Should-Stop: mongodb rabbitmq-server +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: ceilometer alarm notifier +# Description: ceilometer alarm notifier +### END INIT INFO + +# Author: Thomas Goirand + +PATH=/sbin:/usr/sbin:/bin:/usr/bin +DESC="Ceilometer Alarm Notifier" +PROJECT_NAME=ceilometer +NAME=${PROJECT_NAME}-alarm-notifier diff --git a/trusty/debian/ceilometer-api.init b/trusty/debian/ceilometer-api.init deleted file mode 100644 index 3aba0aa..0000000 --- a/trusty/debian/ceilometer-api.init +++ /dev/null @@ -1,113 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: ceilometer-api -# Required-Start: $network $local_fs $remote_fs $syslog -# Required-Stop: $remote_fs -# Should-Start: mongodb rabbitmq-server -# Should-Stop: mongodb rabbitmq-server -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: ceilometer api -# Description: ceilometer api -### END INIT INFO - -# Author: Thomas Goirand - -PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC="Ceilometer API" -SYS_NAME=ceilometer -NAME=ceilometer-api -DAEMON=/usr/bin/${NAME} -DAEMON_ARGS="--log-dir=/var/log/ceilometer" - -SCRIPTNAME=/etc/init.d/${NAME} -DAEMON_USER=${SYS_NAME} -DAEMON_GROUP=${SYS_NAME} -LOCK_DIR=/var/lock/${SYS_NAME} -PID_DIR=/var/run/${SYS_NAME} -PID_FILE=${PID_DIR}/${NAME}.pid -LOGFILE=/var/log/${SYS_NAME}/${NAME}.log -DAEMON_ARGS="--config-file=/etc/${SYS_NAME}/ceilometer.conf" - -[ -x $DAEMON ] || exit 0 - -for i in ${LOCK_DIR} ${PID_DIR} ; do - [ ! -d ${i} ] && mkdir -p ${i} - [ -d ${i} ] && chown ${DAEMON_USER}:${DAEMON_GROUP} ${i} -done - -. /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=$LOGFILE" - -do_start() { - start-stop-daemon --start \ - --background --quiet \ - --chuid ${DAEMON_USER}:${DAEMON_GROUP} \ - --make-pidfile --pidfile ${PID_FILE} \ - --chdir /var/run \ - --startas $DAEMON \ - --test > /dev/null \ - || return 1 - start-stop-daemon --start \ - --background --quiet \ - --chuid ${DAEMON_USER}:${DAEMON_GROUP} \ - --make-pidfile --pidfile ${PID_FILE} \ - --chdir /var/run \ - --startas $DAEMON -- $DAEMON_ARGS \ - || return 2 -} - -do_stop() { - start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PID_FILE - RETVAL=$? - rm -f $PID_FILE - 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 $? -;; -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 - ;; - *) log_end_msg 1 ;; # Failed to stop - esac -;; -*) - echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 - exit 3 -;; -esac - -exit 0 diff --git a/trusty/debian/ceilometer-api.init.in b/trusty/debian/ceilometer-api.init.in new file mode 100644 index 0000000..74b0797 --- /dev/null +++ b/trusty/debian/ceilometer-api.init.in @@ -0,0 +1,19 @@ +#!/bin/sh +### BEGIN INIT INFO +# Provides: ceilometer-api +# Required-Start: $network $local_fs $remote_fs $syslog +# Required-Stop: $remote_fs +# Should-Start: mongodb rabbitmq-server +# Should-Stop: mongodb rabbitmq-server +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: ceilometer api +# Description: ceilometer api +### END INIT INFO + +# Author: Thomas Goirand + +PATH=/sbin:/usr/sbin:/bin:/usr/bin +DESC="Ceilometer API" +PROJECT_NAME=ceilometer +NAME=${PROJECT_NAME}-api diff --git a/trusty/debian/ceilometer-collector.init b/trusty/debian/ceilometer-collector.init deleted file mode 100644 index 205bf42..0000000 --- a/trusty/debian/ceilometer-collector.init +++ /dev/null @@ -1,113 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: ceilometer-collector -# Required-Start: $network $local_fs $remote_fs $syslog -# Required-Stop: $remote_fs -# Should-Start: mongodb rabbitmq-server -# Should-Stop: mongodb rabbitmq-server -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: ceilometer collector -# Description: ceilometer collector -### END INIT INFO - -# Author: Thomas Goirand -# License: Apache-2 - -PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC="Ceilometer Collector" -SYS_NAME=ceilometer -NAME=ceilometer-collector -DAEMON=/usr/bin/${NAME} - -SCRIPTNAME=/etc/init.d/${NAME} -DAEMON_USER=${SYS_NAME} -DAEMON_GROUP=${SYS_NAME} -LOCK_DIR=/var/lock/${SYS_NAME} -PID_DIR=/var/run/${SYS_NAME} -PID_FILE=${PID_DIR}/${NAME}.pid -LOGFILE=/var/log/${SYS_NAME}/${NAME}.log -DAEMON_ARGS="--config-file=/etc/${SYS_NAME}/ceilometer.conf" - -[ -x $DAEMON ] || exit 0 - -for i in ${LOCK_DIR} ${PID_DIR} ; do - [ ! -d ${i} ] && mkdir -p ${i} - [ -d ${i} ] && chown ${DAEMON_USER}:${DAEMON_GROUP} ${i} -done - -. /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=$LOGFILE" - -do_start() { - start-stop-daemon --start \ - --background --quiet \ - --chuid ${DAEMON_USER}:${DAEMON_GROUP} \ - --make-pidfile --pidfile ${PID_FILE} \ - --chdir /var/run \ - --startas $DAEMON \ - --test > /dev/null \ - || return 1 - start-stop-daemon --start \ - --background --quiet \ - --chuid ${DAEMON_USER}:${DAEMON_GROUP} \ - --make-pidfile --pidfile ${PID_FILE} \ - --chdir /var/run \ - --startas $DAEMON -- $DAEMON_ARGS \ - || return 2 -} - -do_stop() { - start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PID_FILE - RETVAL=$? - rm -f $PID_FILE - 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 $? -;; -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 - ;; - *) log_end_msg 1 ;; # Failed to stop - esac -;; -*) - echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 - exit 3 -;; -esac - -exit 0 diff --git a/trusty/debian/ceilometer-collector.init.in b/trusty/debian/ceilometer-collector.init.in new file mode 100644 index 0000000..b7b0d6b --- /dev/null +++ b/trusty/debian/ceilometer-collector.init.in @@ -0,0 +1,20 @@ +#!/bin/sh +### BEGIN INIT INFO +# Provides: ceilometer-collector +# Required-Start: $network $local_fs $remote_fs $syslog +# Required-Stop: $remote_fs +# Should-Start: mongodb rabbitmq-server +# Should-Stop: mongodb rabbitmq-server +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: ceilometer collector +# Description: ceilometer collector +### END INIT INFO + +# Author: Thomas Goirand +# License: Apache-2 + +PATH=/sbin:/usr/sbin:/bin:/usr/bin +DESC="Ceilometer Collector" +PROJECT_NAME=ceilometer +NAME=${PROJECT_NAME}-collector diff --git a/trusty/debian/ceilometer-common.install b/trusty/debian/ceilometer-common.install index 24a41bb..4667534 100644 --- a/trusty/debian/ceilometer-common.install +++ b/trusty/debian/ceilometer-common.install @@ -1,5 +1,7 @@ /usr/bin/ceilometer-dbsync /usr/bin/ceilometer-expirer +/usr/bin/ceilometer-rootwrap +/usr/bin/ceilometer-send-sample etc/ceilometer/pipeline.yaml /etc/ceilometer etc/ceilometer/policy.json /etc/ceilometer tools/show_data.py usr/share/doc/ceilometer diff --git a/trusty/debian/changelog b/trusty/debian/changelog index 45af76a..d5d6c9b 100644 --- a/trusty/debian/changelog +++ b/trusty/debian/changelog @@ -1,3 +1,12 @@ +ceilometer (2014.2~rc1-2) experimental; urgency=medium + + * Added missing binaries. + * Now packaging ceilometer-agent-ipmi. + * Using templated init, upstart and systemd scripts from + openstack-pkg-tools >= 13. + + -- Thomas Goirand Fri, 03 Oct 2014 00:30:58 +0800 + ceilometer (2014.2~rc1-1) experimental; urgency=medium * New upstream release. diff --git a/trusty/debian/control b/trusty/debian/control index 6a3f3af..ca4bc96 100644 --- a/trusty/debian/control +++ b/trusty/debian/control @@ -6,7 +6,7 @@ Uploaders: Julien Danjou , Thomas Goirand , Mehdi Abaakouk Build-Depends: debhelper (>= 9), - openstack-pkg-tools (>= 9~), + openstack-pkg-tools (>= 13~), po-debconf, python-all (>= 2.6.6-3~), python-pbr (>= 0.6), @@ -278,3 +278,20 @@ Description: OpenStack efficient metering counters system - alarm notifier overall system. . This package contains the notification agent daemon. + +Package: ceilometer-agent-ipmi +Architecture: all +Pre-Depends: dpkg (>= 1.15.6~) +Depends: ceilometer-common (= ${binary:Version}), + ${misc:Depends}, + ${ostack-lsb-base}, + ${python:Depends} +Description: OpenStack efficient metering counters system - IPMI agent + Ceilometer aims to deliver a Single Point Of Contact for billing systems, + providing all the counters they need to establish customer billing, across + all current and future OpenStack components. The delivery of counters must be + traceable and auditable, the counters must be easily extensible to support new + projects, and agents doing data collections should be independent of the + overall system. + . + This package contains the IPMI agent daemon.