Merge lp:~james-page/cinder/systemd-support into lp:~ubuntu-server-dev/cinder/kilo

[James Page]

Add support for systemd

[lp:~james-page/cinder/systemd-support]

213. By James Page on 2014-12-12

Amend version

214. By James Page on 2014-12-12

Type fix

Unmerged revisions

214. By James Page on 2014-12-12

Type fix

213. By James Page on 2014-12-12

Amend version

212. By James Page on 2014-12-12

* Add systemd support:
  - d/service.template: Add generic template for all service files.
  - d/control,rules: Add BD on dh-system, add to rules.
  - d/rules: Generate required service files for api, scheduler, volume
    and backup services.

=== modified file 'debian/changelog'
--- debian/changelog	2014-11-19 19:32:41 +0000
+++ debian/changelog	2014-12-12 12:50:31 +0000
@@ -1,10 +1,18 @@
 cinder (1:2014.2-0ubuntu2) UNRELEASED; urgency=medium
 
+  [ Chuck Short ]
   * Open for vivid.
   * debian/control: Update bzr branch. 
   * debian/patches/fix-requirements.patch: Refreshed.
 
- -- Chuck Short <[e-mail]>  Tue, 28 Oct 2014 09:51:25 -0400
+  [ James Page ]
+  * Add systemd support:
+    - d/service.template: Add generic template for all service files.
+    - d/control,rules: Add BD on dh-systemd, add to rules. 
+    - d/rules: Generate required service files for api, scheduler, volume
+      and backup services.
+
+ -- James Page <[e-mail]>  Fri, 12 Dec 2014 12:41:44 +0000
 
 cinder (1:2014.2-0ubuntu1) utopic; urgency=medium
 

=== modified file 'debian/control'
--- debian/control	2014-10-28 13:51:59 +0000
+++ debian/control	2014-12-12 12:50:31 +0000
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Chuck Short <[e-mail]>
-Build-Depends: debhelper (>= 8.0.0), python-all (>= 2.6)
+Build-Depends: debhelper (>= 8.0.0), dh-systemd (>= 1.5), python-all (>= 2.6)
 Build-Depends-Indep:
  python-anyjson (>= 0.3.3),
  python-babel,

=== modified file 'debian/rules'
--- debian/rules	2014-10-01 09:00:23 +0000
+++ debian/rules	2014-12-12 12:50:31 +0000
@@ -4,7 +4,7 @@
 #export DH_VERBOSE=1
 
 %:
-	dh $@  --with python2
+	dh $@  --with python2,systemd
 
 get-orig-source:
 	uscan --verbose --rename --destdir=../build-area
@@ -19,12 +19,21 @@
 	rm -f $$TEMP_REZ
 endif
 
-override_dh_install:
+
+override_dh_auto_build:
+	for service in api backup scheduler volume; do \
+		sed -e "s|__DAEMON__|$$service|g" debian/service.template \
+			> debian/cinder-$$service.service; \
+	done
+	dh_auto_build
+
+override_dh_install: 
 	dh_install --fail-missing -Xbin/cinder-all
 
 override_dh_fixperms:
 	dh_fixperms -Xcinder_tgt.conf
 
 override_dh_clean:
+	rm -f debian/*.service
 	# temporary workaround for d2to1 wonkyness
 	dh_clean -Xsetup.cfg

=== added file 'debian/service.template'
--- debian/service.template	1970-01-01 00:00:00 +0000
+++ debian/service.template	2014-12-12 12:50:31 +0000
@@ -0,0 +1,15 @@
+[Unit]
+Description=OpenStack Cinder __DAEMON__ Server
+After=network.target
+
+[Service]
+Type=simple
+User=cinder
+Group=cinder
+WorkingDirectory=/run
+RuntimeDirectory=cinder
+ExecStart=/usr/bin/cinder-__DAEMON__ --config-file /etc/cinder/cinder.conf --logfile /var/log/cinder/__DAEMON__.log
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target