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

[Corey Bryant]

=== modified file 'debian/changelog'
--- debian/changelog	2015-01-06 13:55:26 +0000
+++ debian/changelog	2015-01-09 17:55:04 +0000
@@ -1,3 +1,17 @@
+heat (2015.1~b1-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Systemd enablement:
+    - 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 pkgos template configurations from
+      Debian heat package (thanks Thomas).
+    - d/*.upstart: Drop in preference to generated files.
+  * d/control,compat: Bump debhelper compat level to 9.
+  * d/*.logrotate,heat-common.logrotate: Move to single logrotate
+    configuration.
+
+ -- Corey Bryant <[e-mail]>  Thu, 08 Jan 2015 15:37:58 -0500
+
 heat (2015.1~b1-0ubuntu1) vivid; urgency=medium
 
   [ Chuck Short ]

=== modified file 'debian/control'
--- debian/control	2015-01-05 20:56:10 +0000
+++ debian/control	2015-01-09 17:55:04 +0000
@@ -10,7 +10,9 @@
  Ghe Rivero <[e-mail]>,
  Mehdi Abaakouk <[e-mail]>
 Build-Depends:
- debhelper (>= 9),
+ debhelper (>= 9~),
+ dh-systemd,
+ openstack-pkg-tools (>= 21~),
  python-all (>= 2.6.6-3~),
  python-pbr (>= 0.6),
 Build-Depends-Indep:

=== added file 'debian/heat-api-cfn.init.in'
--- debian/heat-api-cfn.init.in	1970-01-01 00:00:00 +0000
+++ debian/heat-api-cfn.init.in	2015-01-09 17:55:04 +0000
@@ -0,0 +1,18 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          heat-api-cfn
+# Required-Start:    $network $local_fs $remote_fs $syslog
+# Required-Stop:     $remote_fs
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Heat CFN API
+# Description:       Heat CFN API server
+### END INIT INFO
+
+# Author: Thomas Goirand <[e-mail]>
+
+# PATH should only include /usr/* if it runs after the mountnfs.sh script
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="Heat API"
+PROJECT_NAME=heat
+NAME=${PROJECT_NAME}-api-cfn

=== removed file 'debian/heat-api-cfn.logrotate'
--- debian/heat-api-cfn.logrotate	2013-05-29 17:36:41 +0000
+++ debian/heat-api-cfn.logrotate	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-/var/log/heat/api-cfn.log {
-    daily
-    missingok
-}

=== removed file 'debian/heat-api-cfn.upstart'
--- debian/heat-api-cfn.upstart	2013-08-08 13:55:17 +0000
+++ debian/heat-api-cfn.upstart	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-# vim: set ft=upstart ts=2 et:
-description "Heat API CFN server"
-author "James Page <[e-mail]>"
-
-start on runlevel [2345]
-stop on runlevel [!2345]
-
-exec start-stop-daemon --start --chuid heat --exec /usr/bin/heat-api-cfn

=== added file 'debian/heat-api-cloudwatch.init.in'
--- debian/heat-api-cloudwatch.init.in	1970-01-01 00:00:00 +0000
+++ debian/heat-api-cloudwatch.init.in	2015-01-09 17:55:04 +0000
@@ -0,0 +1,18 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          heat-api-cloudwatch
+# Required-Start:    $network $local_fs $remote_fs $syslog
+# Required-Stop:     $remote_fs
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Heat cloudwatch API
+# Description:       Heat cloudwatch API server
+### END INIT INFO
+
+# Author: Thomas Goirand <[e-mail]>
+
+# PATH should only include /usr/* if it runs after the mountnfs.sh script
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="Heat API"
+PROJECT_NAME=heat
+NAME=${PROJECT_NAME}-api-cloudwatch

=== removed file 'debian/heat-api-cloudwatch.logrotate'
--- debian/heat-api-cloudwatch.logrotate	2013-05-29 17:36:41 +0000
+++ debian/heat-api-cloudwatch.logrotate	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-/var/log/heat/api-cloudwatch.log {
-    daily
-    missingok
-}

=== removed file 'debian/heat-api-cloudwatch.upstart'
--- debian/heat-api-cloudwatch.upstart	2013-08-08 13:55:17 +0000
+++ debian/heat-api-cloudwatch.upstart	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-# vim: set ft=upstart ts=2 et:
-description "Heat API Cloudwatch server"
-author "James Page <[e-mail]>"
-
-start on runlevel [2345]
-stop on runlevel [!2345]
-
-exec start-stop-daemon --start --chuid heat --exec /usr/bin/heat-api-cloudwatch

=== added file 'debian/heat-api.init.in'
--- debian/heat-api.init.in	1970-01-01 00:00:00 +0000
+++ debian/heat-api.init.in	2015-01-09 17:55:04 +0000
@@ -0,0 +1,18 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          heat-api
+# Required-Start:    $network $local_fs $remote_fs $syslog
+# Required-Stop:     $remote_fs
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Heat API
+# Description:       Heat API server
+### END INIT INFO
+
+# Author: Thomas Goirand <[e-mail]>
+
+# PATH should only include /usr/* if it runs after the mountnfs.sh script
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="Heat API"
+PROJECT_NAME=heat
+NAME=${PROJECT_NAME}-api

=== removed file 'debian/heat-api.logrotate'
--- debian/heat-api.logrotate	2013-05-29 17:36:41 +0000
+++ debian/heat-api.logrotate	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-/var/log/heat/api.log {
-    daily
-    missingok
-}

=== removed file 'debian/heat-api.upstart'
--- debian/heat-api.upstart	2013-08-08 13:55:17 +0000
+++ debian/heat-api.upstart	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-# vim: set ft=upstart ts=2 et:
-description "Heat API server"
-author "James Page <[e-mail]>"
-
-start on runlevel [2345]
-stop on runlevel [!2345]
-
-exec start-stop-daemon --start --chuid heat --exec /usr/bin/heat-api

=== added file 'debian/heat-common.logrotate'
--- debian/heat-common.logrotate	1970-01-01 00:00:00 +0000
+++ debian/heat-common.logrotate	2015-01-09 17:55:04 +0000
@@ -0,0 +1,8 @@
+/var/log/heat/*.log {
+    daily
+    missingok
+    compress
+    delaycompress
+    copytruncate
+    notifempty
+}

=== added file 'debian/heat-engine.init.in'
--- debian/heat-engine.init.in	1970-01-01 00:00:00 +0000
+++ debian/heat-engine.init.in	2015-01-09 17:55:04 +0000
@@ -0,0 +1,18 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          heat-engine
+# Required-Start:    $network $local_fs $remote_fs $syslog
+# Required-Stop:     $remote_fs
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Heat Engine
+# Description:       Heat Engine server
+### END INIT INFO
+
+# Author: Thomas Goirand <[e-mail]>
+
+# PATH should only include /usr/* if it runs after the mountnfs.sh script
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="Heat Engine"
+PROJECT_NAME=heat
+NAME=${PROJECT_NAME}-engine

=== removed file 'debian/heat-engine.logrotate'
--- debian/heat-engine.logrotate	2013-05-29 17:36:41 +0000
+++ debian/heat-engine.logrotate	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-/var/log/heat/engine.log {
-    daily
-    missingok
-}

=== removed file 'debian/heat-engine.upstart'
--- debian/heat-engine.upstart	2013-08-08 13:55:17 +0000
+++ debian/heat-engine.upstart	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-# vim: set ft=upstart ts=2 et:
-description "Heat Engine server"
-author "James Page <[e-mail]>"
-
-start on runlevel [2345]
-stop on runlevel [!2345]
-
-exec start-stop-daemon --start --chuid heat --exec /usr/bin/heat-engine

=== modified file 'debian/rules'
--- debian/rules	2015-01-05 20:56:10 +0000
+++ debian/rules	2015-01-09 17:55:04 +0000
@@ -2,6 +2,8 @@
 
 #export DH_VERBOSE=1
 
+include /usr/share/openstack-pkg-tools/pkgos.make
+
 %:
 	dh $@ --buildsystem=python_distutils  --with python2
 
@@ -23,6 +25,7 @@
 	rm -f run_tests.err.log
 	rm -rf pbr*.egg
 	rm -f etc/heat/heat.conf
+	rm -f debian/*.init debian/*.service debian/*.upstart
 
 override_dh_install:
 	bash tools/config/generate_sample.sh -b . -p heat -o etc/heat