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 3c1bd16768b8a421324f39aff5e6529641992097..a82e04c57bf5420a7593c8873d96cc0411e9052e 100644 (file)
--- 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 <zigo@debian.org>
 ### END INIT INFO
 
 # Author: Thomas Goirand <zigo@debian.org>

-
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="Ceilometer Agent Central"
+DESC="OpenStack Ceilometer Agent Central"

 PROJECT_NAME=ceilometer
 NAME=${PROJECT_NAME}-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 95f619d27a7cc18e7cd4da1ab833c0c6856223d8..4297c2da25bd9ed4012921c94cd483099f8a917e 100644 (file)
--- 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 <zigo@debian.org>
 ### END INIT INFO
 
 # Author: Thomas Goirand <zigo@debian.org>

-
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="Ceilometer Agent Compute"
+DESC="OpenStack Ceilometer Agent Compute"

 PROJECT_NAME=ceilometer
 NAME=${PROJECT_NAME}-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 2c03df7e848df67c1c32994a7da5600e7585c69b..0c0b9a31570b57862f11caf82d123a9194af984a 100644 (file)
--- 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 <zigo@debian.org>
 ### END INIT INFO
 
 # Author: Thomas Goirand <zigo@debian.org>

-
-# 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
 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 57eec2f6961f2ef3998824bedb96b677cb14bceb..595961cc7e647148ebca7aac7816e9e52d6d61d3 100644 (file)
--- 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 <zigo@debian.org>
 ### END INIT INFO
 
 # Author: Thomas Goirand <zigo@debian.org>

-
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="Ceilometer Notification Agent"
+DESC="OpenStack Ceilometer Notification Agent"

 PROJECT_NAME=ceilometer
 NAME=${PROJECT_NAME}-agent-notification
 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 051bae7a621d08af2c1e623c09c6a643a9944a1a..b73edc1ec1c075bae8be8360bc8897f9c12a9f2d 100644 (file)
--- 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 <zigo@debian.org>
 ### END INIT INFO
 
 # Author: Thomas Goirand <zigo@debian.org>

-
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="Ceilometer Alarm Evaluator"
+DESC="OpenStack Ceilometer Alarm Evaluator"

 PROJECT_NAME=ceilometer
 NAME=${PROJECT_NAME}-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 d9304c1ae26cb9f74657979581fcb436cf6a36f0..f7f4379a433942354ad4fea1a03533032eee94d5 100644 (file)
--- 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 <zigo@debian.org>
 ### END INIT INFO
 
 # Author: Thomas Goirand <zigo@debian.org>

-
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="Ceilometer Alarm Notifier"
+DESC="OpenStack Ceilometer Alarm Notifier"

 PROJECT_NAME=ceilometer
 NAME=${PROJECT_NAME}-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 74b0797574881459cfe982e18b2444e156214443..875f721135cbebf01fba17e5c6fb9ed42e76171c 100644 (file)
--- a/trusty/debian/ceilometer-api.init.in
+++ b/trusty/debian/ceilometer-api.init.in
@@ -12,8 +12,6 @@
 ### END INIT INFO
 
 # Author: Thomas Goirand <zigo@debian.org>
 ### END INIT INFO
 
 # Author: Thomas Goirand <zigo@debian.org>

-
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="Ceilometer API"
+DESC="OpenStack Ceilometer API"

 PROJECT_NAME=ceilometer
 NAME=${PROJECT_NAME}-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 b7b0d6bd5b7ad3d1a09f4fcaf285f1eda5ebd458..d8677abb4d11990342b936cbbd4d166e45bb79ef 100644 (file)
--- a/trusty/debian/ceilometer-collector.init.in
+++ b/trusty/debian/ceilometer-collector.init.in
@@ -12,9 +12,6 @@
 ### END INIT INFO
 
 # Author: Thomas Goirand <zigo@debian.org>
 ### END INIT INFO
 
 # Author: Thomas Goirand <zigo@debian.org>

-# License: Apache-2
-
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="Ceilometer Collector"
+DESC="OpenStack Ceilometer Collector"

 PROJECT_NAME=ceilometer
 NAME=${PROJECT_NAME}-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 (file)
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 <zigo@debian.org>
+DESC="OpenStack Ceilometer Polling"
+PROJECT_NAME=ceilometer
+NAME=${PROJECT_NAME}-polling

diff --git a/trusty/debian/control b/trusty/debian/control
index a59edd56185b060c6e15884431b7b60df47b9752..d9fd57b5c7e546bac10ffd419d765e5b9c029f04 100644 (file)
--- 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.
 
  .
  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~)
 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.
 
  .
  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},
 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
  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.
  .
  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},
 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
  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.
  .
  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},
 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
  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.
  .
  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},
 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
  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.
  .
  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.