[Pkg-ceph-commits] [ceph] 01/06: Install upstream provided systemd targets to ensure that integrations aligned to upstream packaging with with Ubuntu packages (LP: #1646583).

[James Downing Page]

This is an automated email from the git hooks/post-receive script.

jamespage pushed a commit to branch ubuntu/zesty
in repository ceph.

commit a606edeb7af279eccf64e4e99af7747c31463719
Author: James Page <james.page at ubuntu.com>
Date:   Fri Jan 6 09:37:55 2017 +0000

    Install upstream provided systemd targets to ensure that integrations aligned to upstream packaging with with Ubuntu packages (LP: #1646583).
---
 debian/changelog | 8 ++++++++
 debian/rules     | 5 +++++
 2 files changed, 13 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ca9ea33..8ec0a4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ceph (10.2.5-0ubuntu2) UNRELEASED; urgency=medium
+
+  * d/rules: Install upstream provided systemd targets to ensure that
+    integrations aligned to upstream packaging work with Ubuntu
+    packages (LP: #1646583).
+
+ -- James Page <james.page at ubuntu.com>  Fri, 06 Jan 2017 09:39:02 +0000
+
 ceph (10.2.5-0ubuntu1) zesty; urgency=medium
 
   * New upstream stable release (LP: #1649856).
diff --git a/debian/rules b/debian/rules
index e4b9cf1..8b3d4b6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -99,6 +99,8 @@ override_dh_installinit:
 	sed -i s./etc/sysconfig/./etc/default/.g debian/ceph-base/lib/systemd/system/ceph-create-keys at .service
 	sed -i s./etc/sysconfig/./etc/default/.g debian/ceph-osd/lib/systemd/system/ceph-osd at .service
 	sed -i s./etc/sysconfig/./etc/default/.g debian/ceph-osd/lib/systemd/system/ceph-disk at .service
+	install -m0644 systemd/ceph-mon.target debian/ceph-mon/lib/systemd/system
+	install -m0644 systemd/ceph-osd.target debian/ceph-osd/lib/systemd/system
 	# NOTE(jamespage): Install previous ceph-mon/create-keys service from packaging for upgrades
 	install -m0644 debian/lib-systemd/system/ceph-mon.service debian/ceph-mon/lib/systemd/system
 	install -m0644 debian/lib-systemd/system/ceph-create-keys.service debian/ceph-base/lib/systemd/system
@@ -106,16 +108,19 @@ override_dh_installinit:
 	install -d -m0755 debian/ceph-mds/lib/systemd/system
 	install -m0644 systemd/ceph-mds at .service debian/ceph-mds/lib/systemd/system
 	sed -i s./etc/sysconfig/./etc/default/.g debian/ceph-mds/lib/systemd/system/ceph-mds at .service
+	install -m0644 systemd/ceph-mds.target debian/ceph-mds/lib/systemd/system
 	# NOTE(jamespage): Install previous ceph-mds service from packaging for upgrades
 	install -m0644 debian/lib-systemd/system/ceph-mds.service debian/ceph-mds/lib/systemd/system
 	# systemd:radosgw
 	install -d -m0755 debian/radosgw/lib/systemd/system
 	install -m0644 systemd/ceph-radosgw at .service debian/radosgw/lib/systemd/system
 	sed -i s./etc/sysconfig/./etc/default/.g debian/radosgw/lib/systemd/system/ceph-radosgw at .service
+	install -m0644 systemd/ceph-radosgw.target debian/radosgw/lib/systemd/system
 	# systemd:rbd-mirror
 	install -d -m0755 debian/rbd-mirror/lib/systemd/system
 	install -m0644 systemd/ceph-rbd-mirror at .service debian/rbd-mirror/lib/systemd/system
 	sed -i s./etc/sysconfig/./etc/default/.g debian/rbd-mirror/lib/systemd/system/ceph-rbd-mirror at .service
+	install -m0644 systemd/ceph-rbd-mirror.target debian/rbd-mirror/lib/systemd/system
 
 override_dh_systemd_enable:
 	## Do not enable services to match `dh_installinit --no-start`

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ceph/ceph.git