From: Dmitry Burmistrov Date: Mon, 18 Nov 2013 11:25:36 +0000 (+0400) Subject: Update specs according to OSCI-907 X-Git-Tag: 2014.1~10 X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=15b70d3892959a2dd77cafbd58feb1c8374e6649;p=openstack-build%2Fceilometer-build.git Update specs according to OSCI-907 --- diff --git a/debian/ceilometer-alarm-evaluator.install b/debian/ceilometer-alarm-evaluator.install new file mode 100644 index 0000000..22eb49f --- /dev/null +++ b/debian/ceilometer-alarm-evaluator.install @@ -0,0 +1 @@ +usr/bin/ceilometer-alarm-evaluator diff --git a/debian/ceilometer-alarm-evaluator.postrm b/debian/ceilometer-alarm-evaluator.postrm new file mode 100644 index 0000000..99105ef --- /dev/null +++ b/debian/ceilometer-alarm-evaluator.postrm @@ -0,0 +1,10 @@ +#!/bin/sh + +set -e + +if [ "${1}" = purge ] ; then + rm -f /var/log/ceilometer/ceilometer-alarm-evaluator.log* + [ -d /var/log/ceilometer ] && rmdir --ignore-fail-on-non-empty /var/log/ceilometer +fi + +#DEBHELPER# diff --git a/debian/ceilometer-alarm-evaluator.upstart b/debian/ceilometer-alarm-evaluator.upstart new file mode 100644 index 0000000..d41e565 --- /dev/null +++ b/debian/ceilometer-alarm-evaluator.upstart @@ -0,0 +1,17 @@ +description "ceilometer-alarm-notifier" +author "Thomas Goirand " + +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 + +exec su -s /bin/sh -c "exec ceilometer-alarm-evaluator --config-file /etc/ceilometer/ceilometer.conf --log-file /var/log/ceilometer/ceilometer-alarm-evaluator.log" ceilometer diff --git a/debian/ceilometer-alarm-notifier.install b/debian/ceilometer-alarm-notifier.install new file mode 100644 index 0000000..c0abb6a --- /dev/null +++ b/debian/ceilometer-alarm-notifier.install @@ -0,0 +1 @@ +usr/bin/ceilometer-alarm-notifier diff --git a/debian/ceilometer-alarm-notifier.postrm b/debian/ceilometer-alarm-notifier.postrm new file mode 100644 index 0000000..e13d5c4 --- /dev/null +++ b/debian/ceilometer-alarm-notifier.postrm @@ -0,0 +1,10 @@ +#!/bin/sh + +set -e + +if [ "${1}" = purge ] ; then + rm -f /var/log/ceilometer/ceilometer-alarm-notifier.log* + [ -d /var/log/ceilometer ] && rmdir --ignore-fail-on-non-empty /var/log/ceilometer +fi + +#DEBHELPER# diff --git a/debian/ceilometer-alarm-notifier.upstart b/debian/ceilometer-alarm-notifier.upstart new file mode 100644 index 0000000..8cf8ba0 --- /dev/null +++ b/debian/ceilometer-alarm-notifier.upstart @@ -0,0 +1,17 @@ +description "ceilometer-alarm-notifier" +author "Thomas Goirand " + +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 + +exec su -s /bin/sh -c "exec ceilometer-alarm-notifier --config-file /etc/ceilometer/ceilometer.conf --log-file /var/log/ceilometer/ceilometer-alarm-notifier.log" ceilometer diff --git a/debian/ceilometer-common.install b/debian/ceilometer-common.install index 3586c53..eedce97 100644 --- a/debian/ceilometer-common.install +++ b/debian/ceilometer-common.install @@ -3,7 +3,5 @@ etc/ceilometer/pipeline.yaml etc/ceilometer etc/ceilometer/policy.json etc/ceilometer etc/ceilometer/sources.json etc/ceilometer tools/show_data.py usr/share/doc/ceilometer -usr/bin/ceilometer-alarm-evaluator -usr/bin/ceilometer-alarm-notifier usr/bin/ceilometer-dbsync usr/bin/ceilometer-expirer diff --git a/debian/control b/debian/control index a0111bc..87b9231 100644 --- a/debian/control +++ b/debian/control @@ -187,3 +187,37 @@ Description: ceilometer central agent (A ceilometer is an instrument that measures cloud coverage.) . This package contains the central agent. + +Package: ceilometer-alarm-evaluator +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 - alarm evaluator + Ceilometer aims to deliver a Single Point Of Contact for billing systems, + providing all the counters they need to establish customer billing, accros + 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 alarm evaluator daemon. + +Package: ceilometer-alarm-notifier +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 - alarm notifier + Ceilometer aims to deliver a Single Point Of Contact for billing systems, + providing all the counters they need to establish customer billing, accros + 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 alarm notifier daemon. diff --git a/debian/tests/test_daemons b/debian/tests/test_daemons index 4eba09b..1542aff 100644 --- a/debian/tests/test_daemons +++ b/debian/tests/test_daemons @@ -3,7 +3,7 @@ # Testing ceilometer-daemons #--------------------------- set -e -DAEMONS=('ceilometer-collector' 'ceilometer-api' 'ceilometer-agent-compute' 'ceilometer-agent-central') +DAEMONS=('ceilometer-collector' 'ceilometer-api' 'ceilometer-agent-compute' 'ceilometer-agent-central' 'ceilometer-alarm-evaluator' 'ceilometer-alarm-notifier') for daemon in "${DAEMONS[@]}"; do if pidof -x $daemon > /dev/null; then