From: Nathan Cutler <ncutler@suse.com>
Date: Thu, 25 Feb 2016 20:54:27 +0000 (+0100)
Subject: ceph.spec.in: do not install Ceph RA on systemd platforms
X-Git-Tag: v10.1.0~66^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9acb00ec551e23a551de4b11028d469dbef79185;p=ceph.git

ceph.spec.in: do not install Ceph RA on systemd platforms

The Ceph Resource Agent (RA) wraps the Ceph init script and is incompatible
with systemd.

http://tracker.ceph.com/issues/14828 Fixes: #14828

Signed-off-by: Nathan Cutler <ncutler@suse.com>
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 552f9669531d..c1169e228d92 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -1181,13 +1181,27 @@ fi
 
 #################################################################################
 %if %{with ocf}
+
 %files resource-agents
 %defattr(0755,root,root,-)
 # N.B. src/ocf/Makefile.am uses $(prefix)/lib
 %dir %{_prefix}/lib/ocf
 %dir %{_prefix}/lib/ocf/resource.d
 %dir %{_prefix}/lib/ocf/resource.d/ceph
-%{_prefix}/lib/ocf/resource.d/%{name}/*
+%if 0%{_with_systemd}
+%exclude %{_prefix}/lib/ocf/resource.d/ceph/ceph
+%exclude %{_prefix}/lib/ocf/resource.d/ceph/mds
+%exclude %{_prefix}/lib/ocf/resource.d/ceph/mon
+%exclude %{_prefix}/lib/ocf/resource.d/ceph/osd
+%endif
+%if ! 0%{_with_systemd}
+%{_prefix}/lib/ocf/resource.d/ceph/ceph
+%{_prefix}/lib/ocf/resource.d/ceph/mds
+%{_prefix}/lib/ocf/resource.d/ceph/mon
+%{_prefix}/lib/ocf/resource.d/ceph/osd
+%endif
+%{_prefix}/lib/ocf/resource.d/ceph/rbd
+
 %endif
 
 #################################################################################