The alarm packages are now transition packages to Aodh.

Rewritten-From: bcaf4a10e78e725e445b69f3131b85ef48a9eacf

diff --git a/xenial/debian/ceilometer-alarm-evaluator.init.in b/xenial/debian/ceilometer-alarm-evaluator.init.in
deleted file mode 100644 (file)
index b73edc1..0000000
--- a/xenial/debian/ceilometer-alarm-evaluator.init.in
+++ /dev/null
@@ -1,17 +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 <zigo@debian.org>
-DESC="OpenStack Ceilometer Alarm Evaluator"
-PROJECT_NAME=ceilometer
-NAME=${PROJECT_NAME}-alarm-evaluator

diff --git a/xenial/debian/ceilometer-alarm-evaluator.install b/xenial/debian/ceilometer-alarm-evaluator.install
deleted file mode 100644 (file)
index 22eb49f..0000000
--- a/xenial/debian/ceilometer-alarm-evaluator.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin/ceilometer-alarm-evaluator

diff --git a/xenial/debian/ceilometer-alarm-evaluator.postrm b/xenial/debian/ceilometer-alarm-evaluator.postrm
deleted file mode 100644 (file)
index 99105ef..0000000
--- a/xenial/debian/ceilometer-alarm-evaluator.postrm
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/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/xenial/debian/ceilometer-alarm-notifier.init.in b/xenial/debian/ceilometer-alarm-notifier.init.in
deleted file mode 100644 (file)
index f7f4379..0000000
--- a/xenial/debian/ceilometer-alarm-notifier.init.in
+++ /dev/null
@@ -1,17 +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 <zigo@debian.org>
-DESC="OpenStack Ceilometer Alarm Notifier"
-PROJECT_NAME=ceilometer
-NAME=${PROJECT_NAME}-alarm-notifier

diff --git a/xenial/debian/ceilometer-alarm-notifier.install b/xenial/debian/ceilometer-alarm-notifier.install
deleted file mode 100644 (file)
index c0abb6a..0000000
--- a/xenial/debian/ceilometer-alarm-notifier.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin/ceilometer-alarm-notifier

diff --git a/xenial/debian/ceilometer-alarm-notifier.postrm b/xenial/debian/ceilometer-alarm-notifier.postrm
deleted file mode 100644 (file)
index e13d5c4..0000000
--- a/xenial/debian/ceilometer-alarm-notifier.postrm
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/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/xenial/debian/ceilometer-polling.init.in b/xenial/debian/ceilometer-polling.init.in
deleted file mode 100644 (file)
index 8c0c906..0000000
--- a/xenial/debian/ceilometer-polling.init.in
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/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/xenial/debian/changelog b/xenial/debian/changelog
index 85ce8dd313b55ac1b5cb16d18c057d50b39a8127..90dc9bb25d222e325f4d800868420edd633b2c36 100644 (file)
--- a/xenial/debian/changelog
+++ b/xenial/debian/changelog
@@ -2,6 +2,7 @@ ceilometer (1:6.0.0~b1-1) experimental; urgency=medium
 
   * New upstream release.
   * Fixed (build-)depends for this release.
+  * The alarm packages are now transition packages to Aodh.
 
  -- Thomas Goirand <zigo@debian.org>  Tue, 08 Dec 2015 11:53:07 +0100
 

diff --git a/xenial/debian/control b/xenial/debian/control
index 1af1482ba1ba768af62de0d961c8282a98b5103b..6aa3f5ae84482ea3d3598d045b19e5a4b0139560 100644 (file)
--- a/xenial/debian/control
+++ b/xenial/debian/control
@@ -196,25 +196,6 @@ 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.
- .
- (A ceilometer is an instrument that measures cloud coverage.)
- .
- This package contains the polling service.
-
 Package: ceilometer-api
 Architecture: all
 Depends: adduser,
@@ -313,11 +294,9 @@ Description: OpenStack efficient metering counters system - notification agent
 
 Package: ceilometer-alarm-evaluator
 Architecture: all
-Depends: ceilometer-common (= ${binary:Version}),
+Depends: aodh-evaluator,
          ${misc:Depends},
-         ${ostack-lsb-base},
-         ${python:Depends},
-Description: OpenStack efficient metering counters system - alarm evaluator
+Description: OpenStack efficient metering counters system - aodh-evaluator trans
  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
@@ -325,17 +304,14 @@ Description: OpenStack efficient metering counters system - alarm evaluator
  projects, and agents doing data collections should be independent of the
  overall system.
  .
- (A ceilometer is an instrument that measures cloud coverage.)
- .
- This package contains the alarm evaluator daemon.
+ This package is a transition package to aodh-evaluator and can be safely
+ removed.
 
 Package: ceilometer-alarm-notifier
 Architecture: all
-Depends: ceilometer-common (= ${binary:Version}),
+Depends: aodh-notifier,
          ${misc:Depends},
-         ${ostack-lsb-base},
-         ${python:Depends},
-Description: OpenStack efficient metering counters system - alarm notifier
+Description: OpenStack efficient metering counters system - aodh-notifier trans
  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
@@ -343,9 +319,8 @@ Description: OpenStack efficient metering counters system - alarm notifier
  projects, and agents doing data collections should be independent of the
  overall system.
  .
- (A ceilometer is an instrument that measures cloud coverage.)
- .
- This package contains the alarm notifier daemon.
+ This package is a transition package to aodh-notifier and can be safely
+ removed.
 
 Package: ceilometer-doc
 Section: doc