From: Sage Weil <sage@redhat.com>
Date: Mon, 27 Jul 2015 19:11:10 +0000 (-0400)
Subject: ceph.spec: include systemd units files
X-Git-Tag: v9.1.0~439^2~15
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e283222d0a736a32780db2a55e86033ca296bebf;p=ceph.git

ceph.spec: include systemd units files

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 1b8bae3fbf7d..5090ebc66960 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -18,6 +18,13 @@
 # /var/run/ceph.
 %if 0%{?fedora} || 0%{?rhel} >= 7 || 0%{?suse_version} > 1300
 %global _with_systemd 1
+
+# Use systemd files when possible.
+%if 0%{?fedora} || 0%{?rhel} >= 7 || 0%{?suse_version}
+  %global _with_systemd 1
+  %if 0%{?rhel} || 0%{?fedora}
+    %global _unitdir /usr/lib/systemd/system
+  %endif
 %endif
 
 Name:		ceph
@@ -482,10 +489,7 @@ export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed -e 's/i386/i486/'`
 		--prefix=/usr \
 		--localstatedir=/var \
 		--sysconfdir=/etc \
-%if 0%{?rhel} || 0%{?fedora}
-		--with-systemd-libexec-dir=/usr/lib/systemd/system \
-%endif
-%if 0%{?opensuse} || 0%{?suse_version}
+%if 0%{?_with_systemd}
 		--with-systemdsystemunitdir=%_unitdir \
 %endif
 		--docdir=%{_docdir}/ceph \
@@ -538,13 +542,19 @@ make -j$(getconf _NPROCESSORS_ONLN) check-local
 make DESTDIR=$RPM_BUILD_ROOT install
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type f -name "*.a" -exec rm -f {} ';'
-install -D src/init-ceph $RPM_BUILD_ROOT%{_initrddir}/ceph
-install -D src/init-radosgw $RPM_BUILD_ROOT%{_initrddir}/ceph-radosgw
-install -D src/init-rbdmap $RPM_BUILD_ROOT%{_initrddir}/rbdmap
 install -D src/rbdmap $RPM_BUILD_ROOT%{_sysconfdir}/ceph/rbdmap
 %if 0%{?_with_systemd}
   install -m 0644 -D systemd/ceph.tmpfiles.d $RPM_BUILD_ROOT%{_tmpfilesdir}/%{name}.conf
   install -m 0644 -D systemd/ceph-rgw.tmpfiles.d $RPM_BUILD_ROOT%{_tmpfilesdir}/%{name}-rgw.conf
+  install -m 0644 -D systemd/ceph-osd@.service $RPM_BUILD_ROOT%{_unitdir}/ceph-osd@.service
+  install -m 0644 -D systemd/ceph-mon@.service $RPM_BUILD_ROOT%{_unitdir}/ceph-mon@.service
+  install -m 0644 -D systemd/ceph-mds@.service $RPM_BUILD_ROOT%{_unitdir}/ceph-mds@.service
+  install -m 0644 -D systemd/ceph-radosgw@.service $RPM_BUILD_ROOT%{_unitdir}/ceph-radosgw@.service
+  install -m 0644 -D systemd/ceph.target $RPM_BUILD_ROOT%{_unitdir}/ceph.target
+%else
+  install -D src/init-ceph $RPM_BUILD_ROOT%{_initrddir}/ceph
+  install -D src/init-radosgw $RPM_BUILD_ROOT%{_initrddir}/ceph-radosgw
+  install -D src/init-rbdmap $RPM_BUILD_ROOT%{_initrddir}/rbdmap
 %endif
 mkdir -p $RPM_BUILD_ROOT%{_sbindir}
 ln -sf ../../etc/init.d/ceph %{buildroot}/%{_sbindir}/rcceph
@@ -688,6 +698,7 @@ mkdir -p %{_localstatedir}/run/ceph/
 %{_unitdir}/ceph-mds@.service
 %{_unitdir}/ceph-mon@.service
 %{_unitdir}/ceph-osd@.service
+%{_unitdir}/ceph-radosgw@.service
 %{_unitdir}/ceph.target
 %endif
 %{_sbindir}/ceph-disk