[Pkg-ceph-commits] [ceph] 01/04: 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/xenial
in repository ceph.

commit 91c09610e3abf7b4e629ec11abc26aaf28f946fc
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).
    
    (cherry picked from commit a606edeb7af279eccf64e4e99af7747c31463719)
---
 debian/changelog | 3 +++
 debian/rules     | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 96e39b5..6d596ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ ceph (10.2.5-0ubuntu0.16.04.1) xenial; urgency=medium
     - d/p/32bit-ftbfs.patch: Drop, no longer required.
     - d/p/*: Refresh.
     - d/ceph-common.install: Switch to RSA keys for drop.ceph.com.
+  * 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>  Wed, 14 Dec 2016 11:42:36 +0000
 
diff --git a/debian/rules b/debian/rules
index 3f1c2f1..97afc9b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -126,6 +126,8 @@ override_dh_installinit:
 	sed -i s./etc/sysconfig/./etc/default/.g debian/ceph/lib/systemd/system/ceph-create-keys at .service
 	sed -i s./etc/sysconfig/./etc/default/.g debian/ceph/lib/systemd/system/ceph-osd at .service
 	sed -i s./etc/sysconfig/./etc/default/.g debian/ceph/lib/systemd/system/ceph-disk at .service
+	install -m0644 systemd/ceph-mon.target debian/ceph/lib/systemd/system
+	install -m0644 systemd/ceph-osd.target debian/ceph/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/lib/systemd/system
 	install -m0644 debian/lib-systemd/system/ceph-create-keys.service debian/ceph/lib/systemd/system
@@ -133,16 +135,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