Merge pull request #9917 from SUSE/wip-16461-jewel

jewel: ceph Resource Agent does not work with systemd

Reviewed-by: Loic Dachary <ldachary@redhat.com>

ceph.spec.in

@@ -1201,10 +1201,6 @@ fi
 %dir %{_prefix}/lib/ocf
 %dir %{_prefix}/lib/ocf/resource.d
 %dir %{_prefix}/lib/ocf/resource.d/ceph
-%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
 %{_prefix}/lib/ocf/resource.d/ceph/rbd
 
 %endif

configure.ac

@@ -1356,7 +1356,6 @@ AC_CONFIG_HEADERS([src/acconfig.h])
 AC_CONFIG_FILES([Makefile
 	src/Makefile
 	src/ocf/Makefile
-	src/ocf/ceph
 	src/ocf/rbd
 	src/java/Makefile
 	systemd/Makefile

src/ocf/Makefile.am

@@ -1,4 +1,4 @@
-EXTRA_DIST = ceph.in Makefile.in
+EXTRA_DIST = Makefile.in
 
 if WITH_OCF
 # The root of the OCF resource agent hierarchy
@@ -9,15 +9,5 @@ ocfdir = $(prefix)/lib/ocf
 # The ceph provider directory
 radir = $(ocfdir)/resource.d/$(PACKAGE_NAME)
 
-ra_SCRIPTS = ceph rbd
-
-install-data-hook:
-	$(LN_S) ceph $(DESTDIR)$(radir)/osd
-	$(LN_S) ceph $(DESTDIR)$(radir)/mds
-	$(LN_S) ceph $(DESTDIR)$(radir)/mon
-
-uninstall-hook:
-	rm -f $(DESTDIR)$(radir)/osd
-	rm -f $(DESTDIR)$(radir)/mds
-	rm -f $(DESTDIR)$(radir)/mon
+ra_SCRIPTS = rbd
 endif