]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph.spec.in: do not install Ceph RA on systemd platforms 7894/head
authorNathan Cutler <ncutler@suse.com>
Thu, 25 Feb 2016 20:54:27 +0000 (21:54 +0100)
committerNathan Cutler <ncutler@suse.com>
Thu, 3 Mar 2016 03:46:07 +0000 (04:46 +0100)
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>
ceph.spec.in

index 552f9669531d96b88fd64220ff0283dd2444a508..c1169e228d92a8036b56989a88fd1474de0b9c96 100644 (file)
@@ -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
 
 #################################################################################