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

[Corey Bryant]

[lp:~corey.bryant/ceilometer/systemd]

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

=== added file 'debian/ceilometer-agent-central.init.in'
--- debian/ceilometer-agent-central.init.in	1970-01-01 00:00:00 +0000
+++ debian/ceilometer-agent-central.init.in	2015-01-09 21:15:56 +0000
@@ -0,0 +1,19 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          ceilometer-agent-central
+# 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 central agent
+# Description:       ceilometer central agent
+### END INIT INFO
+
+# Author: Thomas Goirand <[e-mail]>
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="Ceilometer Agent Central"
+PROJECT_NAME=ceilometer
+NAME=${PROJECT_NAME}-agent-central

=== removed file 'debian/ceilometer-agent-central.service'
--- debian/ceilometer-agent-central.service	2015-01-09 12:43:02 +0000
+++ debian/ceilometer-agent-central.service	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-[Unit]
-Description=ceilometer-agent-central
-
-[Service]
-WorkingDirectory=/var/run
-User=ceilometer
-PermissionsStartOnly=true
-ExecStartPre=/bin/mkdir -p /var/run/ceilometer /var/lock/ceilometer
-ExecStartPre=/bin/chown ceilometer:ceilometer /var/run/ceilometer /var/lock/ceilometer
-ExecStart=/usr/bin/ceilometer-agent-central
-
-[Install]
-WantedBy=multi-user.target

=== removed file 'debian/ceilometer-agent-central.upstart'
--- debian/ceilometer-agent-central.upstart	2014-10-01 15:03:44 +0000
+++ debian/ceilometer-agent-central.upstart	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-description "ceilometer-agent-central"
-author "Chuck Short <[e-mail]>"
-
-start on runlevel [2345]
-stop on runlevel [!2345]
-
-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-agent-central

=== added file 'debian/ceilometer-agent-compute.init.in'
--- debian/ceilometer-agent-compute.init.in	1970-01-01 00:00:00 +0000
+++ debian/ceilometer-agent-compute.init.in	2015-01-09 21:15:56 +0000
@@ -0,0 +1,19 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          ceilometer-agent-compute
+# 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 central compute
+# Description:       ceilometer central compute
+### END INIT INFO
+
+# Author: Thomas Goirand <[e-mail]>
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="Ceilometer Agent Compute"
+PROJECT_NAME=ceilometer
+NAME=${PROJECT_NAME}-agent-compute

=== removed file 'debian/ceilometer-agent-compute.service'
--- debian/ceilometer-agent-compute.service	2015-01-09 12:43:02 +0000
+++ debian/ceilometer-agent-compute.service	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-[Unit]
-Description=ceilometer-agent-compute
-
-[Service]
-WorkingDirectory=/var/run
-User=ceilometer
-PermissionsStartOnly=true
-ExecStartPre=/bin/mkdir -p /var/run/ceilometer /var/lock/ceilometer
-ExecStartPre=/bin/chown ceilometer:ceilometer /var/run/ceilometer /var/lock/ceilometer
-ExecStart=/usr/bin/ceilometer-agent-compute
-
-[Install]
-WantedBy=multi-user.target

=== removed file 'debian/ceilometer-agent-compute.upstart'
--- debian/ceilometer-agent-compute.upstart	2014-01-09 17:02:50 +0000
+++ debian/ceilometer-agent-compute.upstart	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-description "ceilometer-agent-compute"
-author "Chuck Short <[e-mail]>"
-
-start on runlevel [2345]
-stop on runlevel [!2345]
-
-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-agent-compute

=== added file 'debian/ceilometer-agent-ipmi.init.in'
--- debian/ceilometer-agent-ipmi.init.in	1970-01-01 00:00:00 +0000
+++ debian/ceilometer-agent-ipmi.init.in	2015-01-09 21:15:56 +0000
@@ -0,0 +1,19 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          ceilometer-agent-ipmi
+# 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 ipmi agent
+# Description:       ceilometer ipmi agent
+### END INIT INFO
+
+# Author: Corey Bryant <[e-mail]>
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="Ceilometer IPMI Agent"
+PROJECT_NAME=ceilometer
+NAME=${PROJECT_NAME}-agent-ipmi

=== removed file 'debian/ceilometer-agent-ipmi.service'
--- debian/ceilometer-agent-ipmi.service	2015-01-09 12:43:02 +0000
+++ debian/ceilometer-agent-ipmi.service	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-[Unit]
-Description=ceilometer-agent-ipmi
-
-[Service]
-WorkingDirectory=/var/run
-User=ceilometer
-PermissionsStartOnly=true
-ExecStartPre=/bin/mkdir -p /var/run/ceilometer /var/lock/ceilometer
-ExecStartPre=/bin/chown ceilometer:ceilometer /var/run/ceilometer /var/lock/ceilometer
-ExecStart=/usr/bin/ceilometer-agent-ipmi
-
-[Install]
-WantedBy=multi-user.target

=== removed file 'debian/ceilometer-agent-ipmi.upstart'
--- debian/ceilometer-agent-ipmi.upstart	2014-10-01 15:03:44 +0000
+++ debian/ceilometer-agent-ipmi.upstart	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-description "ceilometer-agent-ipmi"
-author "Corey Bryant <[e-mail]>"
-
-start on runlevel [2345]
-stop on runlevel [!2345]
-
-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-agent-ipmi

=== added file 'debian/ceilometer-agent-notification.init.in'
--- debian/ceilometer-agent-notification.init.in	1970-01-01 00:00:00 +0000
+++ debian/ceilometer-agent-notification.init.in	2015-01-09 21:15:56 +0000
@@ -0,0 +1,19 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          ceilometer-agent-notification
+# 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 agent notification
+# Description:       ceilometer agent notification
+### END INIT INFO
+
+# Author: Thomas Goirand <[e-mail]>
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="Ceilometer Notification Agent"
+PROJECT_NAME=ceilometer
+NAME=${PROJECT_NAME}-agent-notification

=== removed file 'debian/ceilometer-agent-notification.service'
--- debian/ceilometer-agent-notification.service	2015-01-09 12:43:02 +0000
+++ debian/ceilometer-agent-notification.service	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-[Unit]
-Description=ceilometer-agent-notification
-
-[Service]
-WorkingDirectory=/var/run
-User=ceilometer
-PermissionsStartOnly=true
-ExecStartPre=/bin/mkdir -p /var/run/ceilometer /var/lock/ceilometer
-ExecStartPre=/bin/chown ceilometer:ceilometer /var/run/ceilometer /var/lock/ceilometer
-ExecStart=/usr/bin/ceilometer-agent-notification
-
-[Install]
-WantedBy=multi-user.target

=== removed file 'debian/ceilometer-agent-notification.upstart'
--- debian/ceilometer-agent-notification.upstart	2014-01-09 17:02:50 +0000
+++ debian/ceilometer-agent-notification.upstart	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-description "ceilometer-agent-notification"
-author "Yolanda Robla <[e-mail]>"
-
-start on runlevel [2345]
-stop on runlevel [!2345]
-
-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-agent-notification

=== added file 'debian/ceilometer-alarm-evaluator.init.in'
--- debian/ceilometer-alarm-evaluator.init.in	1970-01-01 00:00:00 +0000
+++ debian/ceilometer-alarm-evaluator.init.in	2015-01-09 21:15:56 +0000
@@ -0,0 +1,19 @@
+#!/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 <[e-mail]>
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="Ceilometer Alarm Evaluator"
+PROJECT_NAME=ceilometer
+NAME=${PROJECT_NAME}-alarm-evaluator

=== removed file 'debian/ceilometer-alarm-evaluator.service'
--- debian/ceilometer-alarm-evaluator.service	2015-01-09 12:43:02 +0000
+++ debian/ceilometer-alarm-evaluator.service	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-[Unit]
-Description=ceilometer-agent-evaluator
-
-[Service]
-WorkingDirectory=/var/run
-User=ceilometer
-PermissionsStartOnly=true
-ExecStartPre=/bin/mkdir -p /var/run/ceilometer /var/lock/ceilometer
-ExecStartPre=/bin/chown ceilometer:ceilometer /var/run/ceilometer /var/lock/ceilometer
-ExecStart=/usr/bin/ceilometer-agent-evaluator --log-dir=/var/log/ceilometer
-
-[Install]
-WantedBy=multi-user.target

=== removed file 'debian/ceilometer-alarm-evaluator.upstart'
--- debian/ceilometer-alarm-evaluator.upstart	2014-01-09 17:02:50 +0000
+++ debian/ceilometer-alarm-evaluator.upstart	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-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.init.in'
--- debian/ceilometer-alarm-notifier.init.in	1970-01-01 00:00:00 +0000
+++ debian/ceilometer-alarm-notifier.init.in	2015-01-09 21:15:56 +0000
@@ -0,0 +1,19 @@
+#!/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 <[e-mail]>
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="Ceilometer Alarm Notifier"
+PROJECT_NAME=ceilometer
+NAME=${PROJECT_NAME}-alarm-notifier

=== removed file 'debian/ceilometer-alarm-notifier.service'
--- debian/ceilometer-alarm-notifier.service	2015-01-09 12:43:02 +0000
+++ debian/ceilometer-alarm-notifier.service	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-[Unit]
-Description=ceilometer-agent-notifier
-
-[Service]
-WorkingDirectory=/var/run
-User=ceilometer
-PermissionsStartOnly=true
-ExecStartPre=/bin/mkdir -p /var/run/ceilometer /var/lock/ceilometer
-ExecStartPre=/bin/chown ceilometer:ceilometer /var/run/ceilometer /var/lock/ceilometer
-ExecStart=/usr/bin/ceilometer-agent-notifier --log-dir=/var/log/ceilometer
-
-[Install]
-WantedBy=multi-user.target

=== removed file 'debian/ceilometer-alarm-notifier.upstart'
--- debian/ceilometer-alarm-notifier.upstart	2014-01-09 17:02:50 +0000
+++ debian/ceilometer-alarm-notifier.upstart	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-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

=== added file 'debian/ceilometer-api.init.in'
--- debian/ceilometer-api.init.in	1970-01-01 00:00:00 +0000
+++ debian/ceilometer-api.init.in	2015-01-09 21:15:56 +0000
@@ -0,0 +1,19 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          ceilometer-api
+# 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 api
+# Description:       ceilometer api
+### END INIT INFO
+
+# Author: Thomas Goirand <[e-mail]>
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="Ceilometer API"
+PROJECT_NAME=ceilometer
+NAME=${PROJECT_NAME}-api

=== removed file 'debian/ceilometer-api.service'
--- debian/ceilometer-api.service	2015-01-09 12:43:02 +0000
+++ debian/ceilometer-api.service	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-[Unit]
-Description=ceilometer-api
-
-[Service]
-WorkingDirectory=/var/run
-User=ceilometer
-PermissionsStartOnly=true
-ExecStartPre=/bin/mkdir -p /var/run/ceilometer /var/lock/ceilometer
-ExecStartPre=/bin/chown ceilometer:ceilometer /var/run/ceilometer /var/lock/ceilometer
-ExecStart=/usr/bin/ceilometer-api --log-dir=/var/log/ceilometer
-
-[Install]
-WantedBy=multi-user.target

=== removed file 'debian/ceilometer-api.upstart'
--- debian/ceilometer-api.upstart	2014-10-01 15:03:44 +0000
+++ debian/ceilometer-api.upstart	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-description "ceilometer-api"
-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-api -- --log-dir=/var/log/ceilometer

=== added file 'debian/ceilometer-collector.init.in'
--- debian/ceilometer-collector.init.in	1970-01-01 00:00:00 +0000
+++ debian/ceilometer-collector.init.in	2015-01-09 21:15:56 +0000
@@ -0,0 +1,20 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          ceilometer-collector
+# 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 collector
+# Description:       ceilometer collector
+### END INIT INFO
+
+# Author: Thomas Goirand <[e-mail]>
+# License: Apache-2
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="Ceilometer Collector"
+PROJECT_NAME=ceilometer
+NAME=${PROJECT_NAME}-collector

=== removed file 'debian/ceilometer-collector.service'
--- debian/ceilometer-collector.service	2015-01-09 12:43:02 +0000
+++ debian/ceilometer-collector.service	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-[Unit]
-Description=ceilometer-collector
-
-[Service]
-WorkingDirectory=/var/run
-User=ceilometer
-PermissionsStartOnly=true
-ExecStartPre=/bin/mkdir -p /var/run/ceilometer /var/lock/ceilometer
-ExecStartPre=/bin/chown ceilometer:ceilometer /var/run/ceilometer /var/lock/ceilometer
-ExecStart=/usr/bin/ceilometer-collector
-
-[Install]
-WantedBy=multi-user.target

=== removed file 'debian/ceilometer-collector.upstart'
--- debian/ceilometer-collector.upstart	2014-10-01 15:03:44 +0000
+++ debian/ceilometer-collector.upstart	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-description "ceilometer-collector"
-author "Chuck Short <[e-mail]>"
-
-start on runlevel [2345]
-stop on runlevel [!2345]
-
-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-collector

=== added file 'debian/ceilometer-polling.init.in'
--- debian/ceilometer-polling.init.in	1970-01-01 00:00:00 +0000
+++ debian/ceilometer-polling.init.in	2015-01-09 21:15:56 +0000
@@ -0,0 +1,19 @@
+#!/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: Corey Bryant <[e-mail]>
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="Ceilometer Polling"
+PROJECT_NAME=ceilometer
+NAME=${PROJECT_NAME}-polling

=== removed file 'debian/ceilometer-polling.service'
--- debian/ceilometer-polling.service	2015-01-09 12:43:02 +0000
+++ debian/ceilometer-polling.service	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-[Unit]
-Description=ceilometer-polling
-
-[Service]
-WorkingDirectory=/var/run
-User=ceilometer
-PermissionsStartOnly=true
-ExecStartPre=/bin/mkdir -p /var/run/ceilometer /var/lock/ceilometer
-ExecStartPre=/bin/chown ceilometer:ceilometer /var/run/ceilometer /var/lock/ceilometer
-ExecStart=/usr/bin/ceilometer-polling --log-dir=/var/log/ceilometer
-
-[Install]
-WantedBy=multi-user.target

=== removed file 'debian/ceilometer-polling.upstart'
--- debian/ceilometer-polling.upstart	2014-12-19 01:36:54 +0000
+++ debian/ceilometer-polling.upstart	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-description "ceilometer-polling"
-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-polling -- --log-dir=/var/log/ceilometer

=== modified file 'debian/changelog'
--- debian/changelog	2015-01-09 12:50:02 +0000
+++ debian/changelog	2015-01-09 21:15:56 +0000
@@ -1,3 +1,16 @@
+ceilometer (2015.1~b1-0ubuntu3) UNRELEASED; urgency=medium
+
+  * 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.
+
+ -- Corey Bryant <[e-mail]>  Thu, 08 Jan 2015 14:19:46 -0500
+
 ceilometer (2015.1~b1-0ubuntu2) vivid; urgency=medium
 
   * Systemd integration:

=== modified file 'debian/compat'
--- debian/compat	2012-11-22 18:55:57 +0000
+++ debian/compat	2015-01-09 21:15:56 +0000
@@ -1,1 +1,1 @@
-8
+9

=== modified file 'debian/control'
--- debian/control	2015-01-09 12:49:49 +0000
+++ debian/control	2015-01-09 21:15:56 +0000
@@ -4,8 +4,9 @@
 Maintainer: Chuck Short <[e-mail]>
 Build-Depends:
  alembic (>= 0.6.4),
- debhelper (>= 8.0.0),
+ debhelper (>= 9~),
  dh-systemd,
+ openstack-pkg-tools (>= 21~),
  python-alembic (>= 0.6.4),
  python-all (>= 2.6),
  python-anyjson (>= 0.3.3),

=== modified file 'debian/rules'
--- debian/rules	2015-01-09 12:43:02 +0000
+++ debian/rules	2015-01-09 21:15:56 +0000
@@ -5,6 +5,8 @@
 
 export HOME="$(CURDIR)/debian/test"
 
+include /usr/share/openstack-pkg-tools/pkgos.make
+
 %:
 	dh $@  --with python2,systemd
 
@@ -36,3 +38,4 @@
 	rm -f etc/ceilometer/ceilometer.conf etc/ceilometer/ceilometer.conf.sample
 	rm -rf .testrepository
 	rm -rf pbr*.egg
+	rm -f debian/*.init debian/*.service debian/*.upstart