10 files changed, 16 insertions, 33 deletions

diff --git a/debian/ceph-common.install b/debian/ceph-common.install
index afba9d90240..dfc713d905e 100755
--- a/debian/ceph-common.install
+++ b/debian/ceph-common.install
@@ -4,6 +4,8 @@ etc/bash_completion.d/ceph
 etc/bash_completion.d/rados
 etc/bash_completion.d/radosgw-admin
 etc/bash_completion.d/rbd
+lib/systemd/system/ceph.target
+lib/systemd/system/rbdmap.service
 usr/bin/ceph
 usr/bin/ceph-authtool
 usr/bin/ceph-conf
diff --git a/debian/ceph-fuse.install b/debian/ceph-fuse.install
index d6ad4dcb2a6..e132b7957c1 100644
--- a/debian/ceph-fuse.install
+++ b/debian/ceph-fuse.install
@@ -1,3 +1,4 @@
+lib/systemd/system/ceph-fuse*
 usr/bin/ceph-fuse
 usr/sbin/mount.fuse.ceph sbin
 usr/share/man/man8/ceph-fuse.8
diff --git a/debian/ceph-mds.install b/debian/ceph-mds.install
index 8a5d74e13c9..a26d5596c59 100644
--- a/debian/ceph-mds.install
+++ b/debian/ceph-mds.install
@@ -1,2 +1,3 @@
+lib/systemd/system/ceph-mds*
 usr/bin/ceph-mds
 usr/share/man/man8/ceph-mds.8
diff --git a/debian/ceph-mgr.install b/debian/ceph-mgr.install
index 0ec0f7063db..34af599462a 100644
--- a/debian/ceph-mgr.install
+++ b/debian/ceph-mgr.install
@@ -1,2 +1,3 @@
+lib/systemd/system/ceph-mgr*
 usr/bin/ceph-mgr
 usr/lib/ceph/mgr
diff --git a/debian/ceph-mon.install b/debian/ceph-mon.install
index edf92852001..a9785bddbb1 100644
--- a/debian/ceph-mon.install
+++ b/debian/ceph-mon.install
@@ -1,3 +1,4 @@
+lib/systemd/system/ceph-mon*
 usr/bin/ceph-mon
 usr/bin/ceph-monstore-tool
 usr/bin/ceph-rest-api
diff --git a/debian/ceph-osd.install b/debian/ceph-osd.install
index 6e03f1b8df9..5e319f743b1 100644
--- a/debian/ceph-osd.install
+++ b/debian/ceph-osd.install
@@ -1,5 +1,8 @@
 lib/udev/rules.d/60-ceph-by-parttypeuuid.rules
 lib/udev/rules.d/95-ceph-osd.rules
+lib/systemd/system/ceph-disk@.service
+lib/systemd/system/ceph-osd*
+lib/systemd/system/ceph-volume@.service
 usr/bin/ceph-bluestore-tool
 usr/bin/ceph-clsinfo
 usr/bin/ceph-objectstore-tool
diff --git a/debian/radosgw.install b/debian/radosgw.install
index d583799299c..329ea0e480f 100644
--- a/debian/radosgw.install
+++ b/debian/radosgw.install
@@ -1,3 +1,4 @@
+lib/systemd/system/ceph-radosgw*
 usr/bin/radosgw
 usr/bin/radosgw-es
 usr/bin/radosgw-object-expirer
diff --git a/debian/rbd-mirror.install b/debian/rbd-mirror.install
index 80f8210361c..cc617a55304 100644
--- a/debian/rbd-mirror.install
+++ b/debian/rbd-mirror.install
@@ -1,2 +1,3 @@
+lib/systemd/system/ceph-rbd-mirror*
 usr/bin/rbd-mirror
 usr/share/man/man8/rbd-mirror.8
diff --git a/debian/rules b/debian/rules
index c8088277447..50495ffb6da 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,11 +6,12 @@ export DESTDIR=$(CURDIR)/debian/tmp
 export DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
 extraopts += -DUSE_CRYPTOPP=OFF -DWITH_OCF=ON -DWITH_LTTNG=ON -DWITH_PYTHON3=ON -DWITH_EMBEDDED=OFF
-extraopts += -DWITH_CEPHFS_JAVA=ON -DWITH_SYSTEMD=OFF
+extraopts += -DWITH_CEPHFS_JAVA=ON -DWITH_SYSTEMD=ON
 # assumes that ceph is exmpt from multiarch support, so we override the libdir.
 extraopts += -DCMAKE_INSTALL_LIBDIR=/usr/lib
 extraopts += -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib
 extraopts += -DCMAKE_INSTALL_SYSCONFDIR=/etc
+extraopts += -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR=/lib/systemd/system
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
   NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
   extraopts += -DBOOST_J=$(NUMJOBS)
@@ -77,52 +78,21 @@ override_dh_installinit:
 	install -d -m0755 debian/rbd-mirror/etc/init
 	install -m0644 src/upstart/ceph-rbd-mirror*.conf debian/rbd-mirror/etc/init
 	# install the systemd stuff manually since we have funny service names
-	install -d -m0755 debian/ceph-common/lib/systemd/system
-	install -m0644 systemd/ceph.target debian/ceph-common/lib/systemd/system
 	install -d -m0755 debian/ceph-common/etc/default
 	install -m0644 etc/default/ceph debian/ceph-common/etc/default/
 	install -d -m0755 debian/ceph-common/usr/lib/tmpfiles.d
 	install -m 0644 -D systemd/ceph.tmpfiles.d debian/ceph-common/usr/lib/tmpfiles.d/ceph.conf
 
-	install -d -m0755 debian/ceph-base/lib/systemd/system
-	install -d -m0755 debian/ceph-mon/lib/systemd/system
-	install -d -m0755 debian/ceph-osd/lib/systemd/system
-	install -m0644 systemd/ceph-mon@.service debian/ceph-mon/lib/systemd/system
-	install -m0644 systemd/ceph-osd@.service debian/ceph-osd/lib/systemd/system
-	install -m0644 systemd/ceph-disk@.service debian/ceph-osd/lib/systemd/system
-	install -m0644 systemd/ceph-volume@.service debian/ceph-osd/lib/systemd/system
-	install -m0644 systemd/rbdmap.service debian/ceph-common/lib/systemd/system
 	sed -i s./etc/sysconfig/./etc/default/.g debian/ceph-mon/lib/systemd/system/ceph-mon@.service
 	sed -i s./etc/sysconfig/./etc/default/.g debian/ceph-osd/lib/systemd/system/ceph-osd@.service
 	sed -i s./etc/sysconfig/./etc/default/.g debian/ceph-osd/lib/systemd/system/ceph-disk@.service
 	sed -i s./etc/sysconfig/./etc/default/.g debian/ceph-osd/lib/systemd/system/ceph-volume@.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
 
-	install -d -m0755 debian/ceph-mds/lib/systemd/system
-	install -m0644 systemd/ceph-mds@.service debian/ceph-mds/lib/systemd/system
 	sed -i s./etc/sysconfig/./etc/default/.g debian/ceph-mds/lib/systemd/system/ceph-mds@.service
-	install -m0644 systemd/ceph-mds.target debian/ceph-mds/lib/systemd/system
-
-	install -d -m0755 debian/ceph-fuse/lib/systemd/system
-	install -m0644 systemd/ceph-fuse@.service debian/ceph-fuse/lib/systemd/system
 	sed -i s./etc/sysconfig/./etc/default/.g debian/ceph-fuse/lib/systemd/system/ceph-fuse@.service
-	install -m0644 systemd/ceph-fuse.target debian/ceph-fuse/lib/systemd/system
-
-	install -d -m0755 debian/ceph-mgr/lib/systemd/system
-	install -m0644 systemd/ceph-mgr@.service debian/ceph-mgr/lib/systemd/system
 	sed -i s./etc/sysconfig/./etc/default/.g debian/ceph-mgr/lib/systemd/system/ceph-mgr@.service
-	install -m0644 systemd/ceph-mgr.target debian/ceph-mgr/lib/systemd/system
-
-	install -d -m0755 debian/radosgw/lib/systemd/system
-	install -m0644 systemd/ceph-radosgw@.service debian/radosgw/lib/systemd/system
 	sed -i s./etc/sysconfig/./etc/default/.g debian/radosgw/lib/systemd/system/ceph-radosgw@.service
-	install -m0644 systemd/ceph-radosgw.target debian/radosgw/lib/systemd/system
-
-	install -d -m0755 debian/rbd-mirror/lib/systemd/system
-	install -m0644 systemd/ceph-rbd-mirror@.service debian/rbd-mirror/lib/systemd/system
 	sed -i s./etc/sysconfig/./etc/default/.g debian/rbd-mirror/lib/systemd/system/ceph-rbd-mirror@.service
-	install -m0644 systemd/ceph-rbd-mirror.target debian/rbd-mirror/lib/systemd/system
 
 	dh_installinit -p ceph-base --name ceph --no-start
 	dh_installinit -p radosgw --no-start
diff --git a/systemd/CMakeLists.txt b/systemd/CMakeLists.txt
index 3b03b6e6132..cd88f328926 100644
--- a/systemd/CMakeLists.txt
+++ b/systemd/CMakeLists.txt
@@ -1,3 +1,5 @@
+set(CMAKE_INSTALL_SYSTEMD_SERVICEDIR "${CMAKE_INSTALL_LIBEXECDIR}/systemd/system"
+  CACHE PATH "Location for systemd service files")
 install(FILES
   ceph.target
   ceph-fuse.target
@@ -17,4 +19,4 @@ install(FILES
   ceph-disk@.service
   ceph-volume@.service
   rbdmap.service
-  DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/systemd/system)
+  DESTINATION ${CMAKE_INSTALL_SYSTEMD_SERVICEDIR})