Merge lp:~zulcss/ceilometer/bug-catchup into lp:~ubuntu-server-dev/ceilometer/icehouse

[Chuck Short]

Ceilometer update

[James Page (james-page)]

Typos in both upstart configs:

+stop on runlelvel [016]

Package description:

+ This package contains the arlarm notifier daemon.

Ideally short descriptions should start with a Capital letter.

review: Needs Fixing

[James Page (james-page)]

Attributation for logrotate files is incorrect, also typo:

Add logroate files,

review: Needs Fixing

[James Page (james-page)]

Does this actually fix bug 1261101 ?

review: Needs Information

[lp:~zulcss/ceilometer/bug-catchup]

83. By Chuck Short on 2014-01-09

debian/ceilometer-collector.logrotate: Add logrotate files,
thanks to Ahmed Rahal. (LP: #1224223)
* Fix typos in upstart files.

=== modified file 'debian/ceilometer-agent-central.upstart'
--- debian/ceilometer-agent-central.upstart	2013-01-31 15:49:38 +0000
+++ debian/ceilometer-agent-central.upstart	2014-01-09 17:03:06 +0000
@@ -2,7 +2,7 @@
 author "Chuck Short <[e-mail]>"
 
 start on runlevel [2345]
-stop on runlelvel [!2345]
+stop on runlevel [!2345]
 
 chdir /var/run
 
 
=== modified file 'debian/ceilometer-agent-compute.upstart'
--- debian/ceilometer-agent-compute.upstart	2013-01-31 15:49:38 +0000
+++ debian/ceilometer-agent-compute.upstart	2014-01-09 17:03:06 +0000
@@ -2,7 +2,7 @@
 author "Chuck Short <[e-mail]>"
 
 start on runlevel [2345]
-stop on runlelvel [!2345]
+stop on runlevel [!2345]
 
 chdir /var/run
 
 
=== modified file 'debian/ceilometer-agent-notification.upstart'
--- debian/ceilometer-agent-notification.upstart	2013-12-04 11:17:00 +0000
+++ debian/ceilometer-agent-notification.upstart	2014-01-09 17:03:06 +0000
@@ -2,7 +2,7 @@
 author "Yolanda Robla <[e-mail]>"
 
 start on runlevel [2345]
-stop on runlelvel [!2345]
+stop on runlevel [!2345]
 
 chdir /var/run
 
 
=== added file 'debian/ceilometer-alarm-evaluator.install'
--- debian/ceilometer-alarm-evaluator.install	1970-01-01 00:00:00 +0000
+++ debian/ceilometer-alarm-evaluator.install	2014-01-09 17:03:06 +0000
@@ -0,0 +1,1 @@
+usr/bin/ceilometer-alarm-evaluator
 
=== added file 'debian/ceilometer-alarm-evaluator.upstart'
--- debian/ceilometer-alarm-evaluator.upstart	1970-01-01 00:00:00 +0000
+++ debian/ceilometer-alarm-evaluator.upstart	2014-01-09 17:03:06 +0000
@@ -0,0 +1,17 @@
+description "ceilometer-alarm-evaluator"
+author "Chuck Short <[e-mail]>"
+
+start on runlevel [2345]
+stop on runlevel [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 start-stop-daemon --start --chuid ceilometer --exec /usr/bin/ceilometer-alarm-evaluator -- --log-dir=/var/log/ceilometer
 
=== added file 'debian/ceilometer-alarm-notifier.install'
--- debian/ceilometer-alarm-notifier.install	1970-01-01 00:00:00 +0000
+++ debian/ceilometer-alarm-notifier.install	2014-01-09 17:03:06 +0000
@@ -0,0 +1,1 @@
+usr/bin/ceilometer-alarm-notifier
 
=== added file 'debian/ceilometer-alarm-notifier.upstart'
--- debian/ceilometer-alarm-notifier.upstart	1970-01-01 00:00:00 +0000
+++ debian/ceilometer-alarm-notifier.upstart	2014-01-09 17:03:06 +0000
@@ -0,0 +1,17 @@
+description "ceilometer-alarm-notifier"
+author "Chuck Short <[e-mail]>"
+
+start on runlevel [2345]
+stop on runlevel [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 start-stop-daemon --start --chuid ceilometer --exec /usr/bin/ceilometer-alarm-notifier -- --log-dir=/var/log/ceilometer
 
=== modified file 'debian/ceilometer-api.upstart'
--- debian/ceilometer-api.upstart	2013-01-31 15:49:38 +0000
+++ debian/ceilometer-api.upstart	2014-01-09 17:03:06 +0000
@@ -2,7 +2,7 @@
 author "Chuck Short <[e-mail]>"
 
 start on runlevel [2345]
-stop on runlelvel [016]
+stop on runlevel [016]
 
 chdir /var/run
 
 
=== modified file 'debian/ceilometer-collector.upstart'
--- debian/ceilometer-collector.upstart	2013-01-31 15:49:38 +0000
+++ debian/ceilometer-collector.upstart	2014-01-09 17:03:06 +0000
@@ -2,7 +2,7 @@
 author "Chuck Short <[e-mail]>"
 
 start on runlevel [2345]
-stop on runlelvel [!2345]
+stop on runlevel [!2345]
 
 chdir /var/run
 
 
=== modified file 'debian/ceilometer-common.install'
--- debian/ceilometer-common.install	2013-09-30 13:26:41 +0000
+++ debian/ceilometer-common.install	2014-01-09 17:03:06 +0000
@@ -3,7 +3,5 @@
 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
 
=== modified file 'debian/changelog'
--- debian/changelog	2013-12-18 10:52:40 +0000
+++ debian/changelog	2014-01-09 17:03:06 +0000
@@ -1,7 +1,20 @@
 ceilometer (2014.1~b1+master-0ubuntu1) UNRELEASED; urgency=medium
 
+  [ James Page ]
   * d/control: Add python-jsonpath-rw to BD's.
   * d/p/fix-setup-requirements.patch: Bump WebOb to support < 1.4.
+   (LP: #1261101)
+
+  [ Chuck Short ]
+  * debian/control, debian/ceilometer-common.install: Split out
+    ceilometer-alarm-evaluator and ceilometer-alarm-notifier into their
+    own packages. (LP: #1250002)
+  * debian/ceilometer-agent-central.logrotate,
+    debian/ceilometer-agent-compute.logrotate,
+    debian/ceilometer-api.logrotate,
+    debian/ceilometer-collector.logrotate: Add logrotate files, 
+    thanks to Ahmed Rahal. (LP: #1224223)
+  * Fix typos in upstart files.
 
  -- James Page <[e-mail]>  Tue, 17 Dec 2013 15:43:07 +0000
 
 
=== modified file 'debian/control'
--- debian/control	2013-12-18 10:52:40 +0000
+++ debian/control	2014-01-09 17:03:06 +0000
@@ -209,3 +209,41 @@
  (A ceilometer is an instrument that measures cloud coverage.)
  .
  This package contains the notificaiton agent.
+
+Package: ceilometer-alarm-evaluator
+Architecture: all
+Depends:
+ ceilometer-common (= ${binary:Version}),
+ ${misc:Depends},
+ ${python:Depends}
+Description: Ceilometer alarm evaluator
+ Ceilometer aims to deliver a unique point of contact for billing systems to
+ aquire all counters they need to establish  customer billing, accross all
+ current and future OpenStack components. The delivery of counters must
+ be tracable 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 alarm evaluator daemon.
+
+Package: ceilometer-alarm-notifier
+Architecture: all
+Depends:
+ ceilometer-common (= ${binary:Version}),
+ ${misc:Depends},
+ ${python:Depends}
+Description: Ceilometer notification agent
+ Ceilometer aims to deliver a unique point of contact for billing systems to
+ aquire all counters they need to establish  customer billing, accross all
+ current and future OpenStack components. The delivery of counters must
+ be tracable 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 arlarm notifier daemon.
+
+