From: Thomas Goirand Date: Thu, 4 Jun 2015 09:10:04 +0000 (+0200) Subject: Added ceilometer-polling as new package. X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=285b8e4767614fe5fe8ef9fa3637ff986031674a;p=openstack-build%2Fceilometer-build.git Added ceilometer-polling as new package. Rewritten-From: 8b8fe9eba01ca1a888e4e2c2699d4ac81093bcc4 --- diff --git a/trusty/debian/ceilometer-agent-central.init.in b/trusty/debian/ceilometer-agent-central.init.in index 3c1bd16..a82e04c 100644 --- a/trusty/debian/ceilometer-agent-central.init.in +++ b/trusty/debian/ceilometer-agent-central.init.in @@ -12,8 +12,6 @@ ### END INIT INFO # Author: Thomas Goirand - -PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC="Ceilometer Agent Central" +DESC="OpenStack Ceilometer Agent Central" PROJECT_NAME=ceilometer NAME=${PROJECT_NAME}-agent-central diff --git a/trusty/debian/ceilometer-agent-compute.init.in b/trusty/debian/ceilometer-agent-compute.init.in index 95f619d..4297c2d 100644 --- a/trusty/debian/ceilometer-agent-compute.init.in +++ b/trusty/debian/ceilometer-agent-compute.init.in @@ -12,8 +12,6 @@ ### END INIT INFO # Author: Thomas Goirand - -PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC="Ceilometer Agent Compute" +DESC="OpenStack 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 index 2c03df7..0c0b9a3 100644 --- a/trusty/debian/ceilometer-agent-ipmi.init.in +++ b/trusty/debian/ceilometer-agent-ipmi.init.in @@ -12,9 +12,6 @@ ### 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" +DESC="OpenStack Ceilometer Agent IPMI" PROJECT_NAME=ceilometer NAME=${PROJECT_NAME}-agent-ipmi diff --git a/trusty/debian/ceilometer-agent-notification.init.in b/trusty/debian/ceilometer-agent-notification.init.in index 57eec2f..595961c 100644 --- a/trusty/debian/ceilometer-agent-notification.init.in +++ b/trusty/debian/ceilometer-agent-notification.init.in @@ -12,8 +12,6 @@ ### END INIT INFO # Author: Thomas Goirand - -PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC="Ceilometer Notification Agent" +DESC="OpenStack Ceilometer Notification Agent" PROJECT_NAME=ceilometer NAME=${PROJECT_NAME}-agent-notification diff --git a/trusty/debian/ceilometer-alarm-evaluator.init.in b/trusty/debian/ceilometer-alarm-evaluator.init.in index 051bae7..b73edc1 100644 --- a/trusty/debian/ceilometer-alarm-evaluator.init.in +++ b/trusty/debian/ceilometer-alarm-evaluator.init.in @@ -12,8 +12,6 @@ ### END INIT INFO # Author: Thomas Goirand - -PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC="Ceilometer Alarm Evaluator" +DESC="OpenStack Ceilometer Alarm Evaluator" PROJECT_NAME=ceilometer NAME=${PROJECT_NAME}-alarm-evaluator diff --git a/trusty/debian/ceilometer-alarm-notifier.init.in b/trusty/debian/ceilometer-alarm-notifier.init.in index d9304c1..f7f4379 100644 --- a/trusty/debian/ceilometer-alarm-notifier.init.in +++ b/trusty/debian/ceilometer-alarm-notifier.init.in @@ -12,8 +12,6 @@ ### END INIT INFO # Author: Thomas Goirand - -PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC="Ceilometer Alarm Notifier" +DESC="OpenStack Ceilometer Alarm Notifier" PROJECT_NAME=ceilometer NAME=${PROJECT_NAME}-alarm-notifier diff --git a/trusty/debian/ceilometer-api.init.in b/trusty/debian/ceilometer-api.init.in index 74b0797..875f721 100644 --- a/trusty/debian/ceilometer-api.init.in +++ b/trusty/debian/ceilometer-api.init.in @@ -12,8 +12,6 @@ ### END INIT INFO # Author: Thomas Goirand - -PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC="Ceilometer API" +DESC="OpenStack Ceilometer API" PROJECT_NAME=ceilometer NAME=${PROJECT_NAME}-api diff --git a/trusty/debian/ceilometer-collector.init.in b/trusty/debian/ceilometer-collector.init.in index b7b0d6b..d8677ab 100644 --- a/trusty/debian/ceilometer-collector.init.in +++ b/trusty/debian/ceilometer-collector.init.in @@ -12,9 +12,6 @@ ### END INIT INFO # Author: Thomas Goirand -# License: Apache-2 - -PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC="Ceilometer Collector" +DESC="OpenStack Ceilometer Collector" PROJECT_NAME=ceilometer NAME=${PROJECT_NAME}-collector diff --git a/trusty/debian/ceilometer-polling.init.in b/trusty/debian/ceilometer-polling.init.in new file mode 100644 index 0000000..8c0c906 --- /dev/null +++ b/trusty/debian/ceilometer-polling.init.in @@ -0,0 +1,17 @@ +#!/bin/sh +### BEGIN INIT INFO +# Provides: ceilometer-polling +# 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 polling +# Description: ceilometer polling +### END INIT INFO + +# Author: Thomas Goirand +DESC="OpenStack Ceilometer Polling" +PROJECT_NAME=ceilometer +NAME=${PROJECT_NAME}-polling diff --git a/trusty/debian/control b/trusty/debian/control index a59edd5..d9fd57b 100644 --- a/trusty/debian/control +++ b/trusty/debian/control @@ -189,6 +189,24 @@ Description: OpenStack efficient metering counters system - collector service . This package contains the collector service. +Package: ceilometer-polling +Architecture: all +Depends: + ceilometer-common (= ${binary:Version}), + ${misc:Depends}, + ${ostack-lsb-base}, + ${python:Depends} +Suggests: mongodb +Description: OpenStack efficient metering counters system - polling service + 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 polling service. + Package: ceilometer-api Architecture: all Pre-Depends: dpkg (>= 1.15.6~) @@ -242,14 +260,14 @@ Description: OpenStack efficient metering counters system - central agent . This package contains the central agent. -Package: ceilometer-alarm-evaluator +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 - alarm evaluator +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 @@ -257,16 +275,16 @@ Description: OpenStack efficient metering counters system - alarm evaluator projects, and agents doing data collections should be independent of the overall system. . - This package contains the alarm evaluator daemon. + This package contains the IPMI agent daemon. -Package: ceilometer-alarm-notifier +Package: ceilometer-agent-notification 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 +Description: OpenStack efficient metering counters system - agent notification 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 @@ -274,16 +292,16 @@ Description: OpenStack efficient metering counters system - alarm notifier projects, and agents doing data collections should be independent of the overall system. . - This package contains the alarm notifier daemon. + This package contains the notification agent daemon. -Package: ceilometer-agent-notification +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 - agent notification +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, across all current and future OpenStack components. The delivery of counters must be @@ -291,16 +309,16 @@ Description: OpenStack efficient metering counters system - agent notification projects, and agents doing data collections should be independent of the overall system. . - This package contains the notification agent daemon. + This package contains the alarm evaluator daemon. -Package: ceilometer-agent-ipmi +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 - IPMI agent +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, across all current and future OpenStack components. The delivery of counters must be @@ -308,4 +326,4 @@ Description: OpenStack efficient metering counters system - IPMI agent projects, and agents doing data collections should be independent of the overall system. . - This package contains the IPMI agent daemon. + This package contains the alarm notifier daemon.