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

Proposed by Chuck Short on 2014-01-09
Status: Merged
Approved by: Chuck Short on 2014-01-14
Approved revision: 83
Merged at revision: 82
Proposed branch: lp:~zulcss/ceilometer/bug-catchup
Merge into: lp:~ubuntu-server-dev/ceilometer/icehouse
Diff against target: 203 lines (+92/-7)
12 files modified
debian/ceilometer-agent-central.upstart (+1/-1)
debian/ceilometer-agent-compute.upstart (+1/-1)
debian/ceilometer-agent-notification.upstart (+1/-1)
debian/ceilometer-alarm-evaluator.install (+1/-0)
debian/ceilometer-alarm-evaluator.upstart (+17/-0)
debian/ceilometer-alarm-notifier.install (+1/-0)
debian/ceilometer-alarm-notifier.upstart (+17/-0)
debian/ceilometer-api.upstart (+1/-1)
debian/ceilometer-collector.upstart (+1/-1)
debian/ceilometer-common.install (+0/-2)
debian/changelog (+13/-0)
debian/control (+38/-0)
To merge this branch: bzr merge lp:~zulcss/ceilometer/bug-catchup
Reviewer Review Type Date Requested Status
James Page 2014-01-09 Needs Information on 2014-01-09
Review via email: mp+201041@code.launchpad.net

Description of the change

Ceilometer update

To post a comment you must log in.
James Page (james-page) wrote :

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) wrote :

Attributation for logrotate files is incorrect, also typo:

Add logroate files,

review: Needs Fixing
James Page (james-page) wrote :

Does this actually fix bug 1261101 ?

review: Needs Information
lp:~zulcss/ceilometer/bug-catchup updated on 2014-01-09
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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/ceilometer-agent-central.upstart'
2--- debian/ceilometer-agent-central.upstart 2013-01-31 15:49:38 +0000
3+++ debian/ceilometer-agent-central.upstart 2014-01-09 17:03:06 +0000
4@@ -2,7 +2,7 @@
5 author "Chuck Short <zulcss@ubuntu.com>"
6
7 start on runlevel [2345]
8-stop on runlelvel [!2345]
9+stop on runlevel [!2345]
10
11 chdir /var/run
12
13
14=== modified file 'debian/ceilometer-agent-compute.upstart'
15--- debian/ceilometer-agent-compute.upstart 2013-01-31 15:49:38 +0000
16+++ debian/ceilometer-agent-compute.upstart 2014-01-09 17:03:06 +0000
17@@ -2,7 +2,7 @@
18 author "Chuck Short <zulcss@ubuntu.com>"
19
20 start on runlevel [2345]
21-stop on runlelvel [!2345]
22+stop on runlevel [!2345]
23
24 chdir /var/run
25
26
27=== modified file 'debian/ceilometer-agent-notification.upstart'
28--- debian/ceilometer-agent-notification.upstart 2013-12-04 11:17:00 +0000
29+++ debian/ceilometer-agent-notification.upstart 2014-01-09 17:03:06 +0000
30@@ -2,7 +2,7 @@
31 author "Yolanda Robla <yolanda.robla@canonical.com>"
32
33 start on runlevel [2345]
34-stop on runlelvel [!2345]
35+stop on runlevel [!2345]
36
37 chdir /var/run
38
39
40=== added file 'debian/ceilometer-alarm-evaluator.install'
41--- debian/ceilometer-alarm-evaluator.install 1970-01-01 00:00:00 +0000
42+++ debian/ceilometer-alarm-evaluator.install 2014-01-09 17:03:06 +0000
43@@ -0,0 +1,1 @@
44+usr/bin/ceilometer-alarm-evaluator
45
46=== added file 'debian/ceilometer-alarm-evaluator.upstart'
47--- debian/ceilometer-alarm-evaluator.upstart 1970-01-01 00:00:00 +0000
48+++ debian/ceilometer-alarm-evaluator.upstart 2014-01-09 17:03:06 +0000
49@@ -0,0 +1,17 @@
50+description "ceilometer-alarm-evaluator"
51+author "Chuck Short <zulcss@ubuntu.com>"
52+
53+start on runlevel [2345]
54+stop on runlevel [016]
55+
56+chdir /var/run
57+
58+pre-start script
59+ mkdir -p /var/run/ceilometer
60+ chown ceilometer:ceilometer /var/run/ceilometer
61+
62+ mkdir -p /var/lock/ceilometer
63+ chown ceilometer:ceilometer /var/lock/ceilometer
64+end script
65+
66+exec start-stop-daemon --start --chuid ceilometer --exec /usr/bin/ceilometer-alarm-evaluator -- --log-dir=/var/log/ceilometer
67
68=== added file 'debian/ceilometer-alarm-notifier.install'
69--- debian/ceilometer-alarm-notifier.install 1970-01-01 00:00:00 +0000
70+++ debian/ceilometer-alarm-notifier.install 2014-01-09 17:03:06 +0000
71@@ -0,0 +1,1 @@
72+usr/bin/ceilometer-alarm-notifier
73
74=== added file 'debian/ceilometer-alarm-notifier.upstart'
75--- debian/ceilometer-alarm-notifier.upstart 1970-01-01 00:00:00 +0000
76+++ debian/ceilometer-alarm-notifier.upstart 2014-01-09 17:03:06 +0000
77@@ -0,0 +1,17 @@
78+description "ceilometer-alarm-notifier"
79+author "Chuck Short <zulcss@ubuntu.com>"
80+
81+start on runlevel [2345]
82+stop on runlevel [016]
83+
84+chdir /var/run
85+
86+pre-start script
87+ mkdir -p /var/run/ceilometer
88+ chown ceilometer:ceilometer /var/run/ceilometer
89+
90+ mkdir -p /var/lock/ceilometer
91+ chown ceilometer:ceilometer /var/lock/ceilometer
92+end script
93+
94+exec start-stop-daemon --start --chuid ceilometer --exec /usr/bin/ceilometer-alarm-notifier -- --log-dir=/var/log/ceilometer
95
96=== modified file 'debian/ceilometer-api.upstart'
97--- debian/ceilometer-api.upstart 2013-01-31 15:49:38 +0000
98+++ debian/ceilometer-api.upstart 2014-01-09 17:03:06 +0000
99@@ -2,7 +2,7 @@
100 author "Chuck Short <zulcss@ubuntu.com>"
101
102 start on runlevel [2345]
103-stop on runlelvel [016]
104+stop on runlevel [016]
105
106 chdir /var/run
107
108
109=== modified file 'debian/ceilometer-collector.upstart'
110--- debian/ceilometer-collector.upstart 2013-01-31 15:49:38 +0000
111+++ debian/ceilometer-collector.upstart 2014-01-09 17:03:06 +0000
112@@ -2,7 +2,7 @@
113 author "Chuck Short <zulcss@ubuntu.com>"
114
115 start on runlevel [2345]
116-stop on runlelvel [!2345]
117+stop on runlevel [!2345]
118
119 chdir /var/run
120
121
122=== modified file 'debian/ceilometer-common.install'
123--- debian/ceilometer-common.install 2013-09-30 13:26:41 +0000
124+++ debian/ceilometer-common.install 2014-01-09 17:03:06 +0000
125@@ -3,7 +3,5 @@
126 etc/ceilometer/policy.json etc/ceilometer
127 etc/ceilometer/sources.json etc/ceilometer
128 tools/show_data.py usr/share/doc/ceilometer
129-usr/bin/ceilometer-alarm-evaluator
130-usr/bin/ceilometer-alarm-notifier
131 usr/bin/ceilometer-dbsync
132 usr/bin/ceilometer-expirer
133
134=== modified file 'debian/changelog'
135--- debian/changelog 2013-12-18 10:52:40 +0000
136+++ debian/changelog 2014-01-09 17:03:06 +0000
137@@ -1,7 +1,20 @@
138 ceilometer (2014.1~b1+master-0ubuntu1) UNRELEASED; urgency=medium
139
140+ [ James Page ]
141 * d/control: Add python-jsonpath-rw to BD's.
142 * d/p/fix-setup-requirements.patch: Bump WebOb to support < 1.4.
143+ (LP: #1261101)
144+
145+ [ Chuck Short ]
146+ * debian/control, debian/ceilometer-common.install: Split out
147+ ceilometer-alarm-evaluator and ceilometer-alarm-notifier into their
148+ own packages. (LP: #1250002)
149+ * debian/ceilometer-agent-central.logrotate,
150+ debian/ceilometer-agent-compute.logrotate,
151+ debian/ceilometer-api.logrotate,
152+ debian/ceilometer-collector.logrotate: Add logrotate files,
153+ thanks to Ahmed Rahal. (LP: #1224223)
154+ * Fix typos in upstart files.
155
156 -- James Page <james.page@ubuntu.com> Tue, 17 Dec 2013 15:43:07 +0000
157
158
159=== modified file 'debian/control'
160--- debian/control 2013-12-18 10:52:40 +0000
161+++ debian/control 2014-01-09 17:03:06 +0000
162@@ -209,3 +209,41 @@
163 (A ceilometer is an instrument that measures cloud coverage.)
164 .
165 This package contains the notificaiton agent.
166+
167+Package: ceilometer-alarm-evaluator
168+Architecture: all
169+Depends:
170+ ceilometer-common (= ${binary:Version}),
171+ ${misc:Depends},
172+ ${python:Depends}
173+Description: Ceilometer alarm evaluator
174+ Ceilometer aims to deliver a unique point of contact for billing systems to
175+ aquire all counters they need to establish customer billing, accross all
176+ current and future OpenStack components. The delivery of counters must
177+ be tracable and auditable, the counters must be easily extensible to support
178+ new projects, and agents doing data collections should be
179+ independent of the overall system.
180+ .
181+ (A ceilometer is an instrument that measures cloud coverage.)
182+ .
183+ This package contains the alarm evaluator daemon.
184+
185+Package: ceilometer-alarm-notifier
186+Architecture: all
187+Depends:
188+ ceilometer-common (= ${binary:Version}),
189+ ${misc:Depends},
190+ ${python:Depends}
191+Description: Ceilometer notification agent
192+ Ceilometer aims to deliver a unique point of contact for billing systems to
193+ aquire all counters they need to establish customer billing, accross all
194+ current and future OpenStack components. The delivery of counters must
195+ be tracable and auditable, the counters must be easily extensible to support
196+ new projects, and agents doing data collections should be
197+ independent of the overall system.
198+ .
199+ (A ceilometer is an instrument that measures cloud coverage.)
200+ .
201+ This package contains the arlarm notifier daemon.
202+
203+

Subscribers

People subscribed via source and target branches