Ceilometer

Merge lp://staging/~corey.bryant/ceilometer/systemd into lp://staging/~ubuntu-server-dev/ceilometer/kilo

systemd
Merge into kilo

Proposed by Corey Bryant on 2015-01-09

Status:	Merged
Merged at revision:	132
Proposed branch:	lp://staging/~corey.bryant/ceilometer/systemd
Merge into:	lp://staging/~ubuntu-server-dev/ceilometer/kilo
Diff against target:	637 lines (+191/-272) 31 files modified debian/ceilometer-agent-central.init.in (+19/-0) debian/ceilometer-agent-central.service (+0/-13) debian/ceilometer-agent-central.upstart (+0/-17) debian/ceilometer-agent-compute.init.in (+19/-0) debian/ceilometer-agent-compute.service (+0/-13) debian/ceilometer-agent-compute.upstart (+0/-17) debian/ceilometer-agent-ipmi.init.in (+19/-0) debian/ceilometer-agent-ipmi.service (+0/-13) debian/ceilometer-agent-ipmi.upstart (+0/-17) debian/ceilometer-agent-notification.init.in (+19/-0) debian/ceilometer-agent-notification.service (+0/-13) debian/ceilometer-agent-notification.upstart (+0/-17) debian/ceilometer-alarm-evaluator.init.in (+19/-0) debian/ceilometer-alarm-evaluator.service (+0/-13) debian/ceilometer-alarm-evaluator.upstart (+0/-17) debian/ceilometer-alarm-notifier.init.in (+19/-0) debian/ceilometer-alarm-notifier.service (+0/-13) debian/ceilometer-alarm-notifier.upstart (+0/-17) debian/ceilometer-api.init.in (+19/-0) debian/ceilometer-api.service (+0/-13) debian/ceilometer-api.upstart (+0/-17) debian/ceilometer-collector.init.in (+20/-0) debian/ceilometer-collector.service (+0/-13) debian/ceilometer-collector.upstart (+0/-17) debian/ceilometer-polling.init.in (+19/-0) debian/ceilometer-polling.service (+0/-13) debian/ceilometer-polling.upstart (+0/-17) debian/changelog (+13/-0) debian/compat (+1/-1) debian/control (+2/-1) debian/rules (+3/-0)
To merge this branch:	bzr merge lp://staging/~corey.bryant/ceilometer/systemd
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Ubuntu Server Developers		2015-01-09	Pending
Review via email: mp+245973@code.staging.launchpad.net

lp://staging/~corey.bryant/ceilometer/systemd updated on 2015-01-09

129. By Corey Bryant on 2015-01-09: * Systemd enablement:
  - d/*.service: Dropped in favor of template approach.
  - d/control: Add dh-systemd and openstack-pkg-tools to BD's.
  - d/rules: Enable use of pkgos, tidyup generated init files.
  - d/*.init.in: Cherry pick and adapt pkgos template configurations from
    Debian ceilometer package (thanks Thomas).
  - d/*.upstart: Drop in preference to generated files.
* d/control,compat: Bump debhelper compat level to 9.
* Systemd integration:
  - add the 6 systemd debian/*.service corresponding to the upstart jobs
  - debian/control: add dh-systemd build-dep
  - debian/rules: enables systemd helper
* debian/control:
  - fix Vcs-Bzr to point to kilo