[PATCH manager] ceph-after-pve-cluster: use a prefix drop-in for ceph-* services

[PATCH manager] ceph-after-pve-cluster: use a prefix drop-in for ceph-* services

[Kefu Chai]

The Ceph services read /etc/ceph/ceph.conf, a symlink into /etc/pve,
so they have to start after pve-cluster. Until now we installed the
drop-in that orders them unit by unit, and missed the units that came
later. So:

1. Replace the drop-ins for ceph-mon@, ceph-mgr@, ceph-osd@, ceph-mds@
   and ceph-volume@ with a single one in ceph-.service.d/. systemd
   applies it to every unit whose name starts with "ceph-", including
   ones Ceph adds later.

2. With that, ceph-crash is ordered after pve-cluster too. Without the
   drop-in it could start before /etc/pve was mounted, and its startup
   check failed with:

     Error initializing cluster client: ObjectNotFound('RADOS object
     not found (error calling conf_read_file)')

   ceph-exporter and ceph-radosgw@ had no drop-in either and are now
   covered the same way.

3. rbdmap.service and cephfs-mirror@.service read the same config, but
   their names don't match the prefix, so install the drop-in for each
   of them.

Signed-off-by: Kefu Chai <k.chai@proxmox.com>
---
 services/Makefile | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/services/Makefile b/services/Makefile
index 347a6d11..01e8fc99 100644
--- a/services/Makefile
+++ b/services/Makefile
@@ -21,16 +21,12 @@ SERVICES=			\
 install: $(SERVICES)
 	install -d $(SERVICEDIR)
 	install -m 0644 $(SERVICES) $(SERVICEDIR)
-	install -d $(SERVICEDIR)/ceph-mon@.service.d
-	install -m 0644 ceph-after-pve-cluster.conf $(SERVICEDIR)/ceph-mon@.service.d
-	install -d $(SERVICEDIR)/ceph-mgr@.service.d
-	install -m 0644 ceph-after-pve-cluster.conf $(SERVICEDIR)/ceph-mgr@.service.d
-	install -d $(SERVICEDIR)/ceph-osd@.service.d
-	install -m 0644 ceph-after-pve-cluster.conf $(SERVICEDIR)/ceph-osd@.service.d
-	install -d $(SERVICEDIR)/ceph-volume@.service.d
-	install -m 0644 ceph-after-pve-cluster.conf $(SERVICEDIR)/ceph-volume@.service.d
-	install -d $(SERVICEDIR)/ceph-mds@.service.d
-	install -m 0644 ceph-after-pve-cluster.conf $(SERVICEDIR)/ceph-mds@.service.d
+	install -d $(SERVICEDIR)/ceph-.service.d
+	install -m 0644 ceph-after-pve-cluster.conf $(SERVICEDIR)/ceph-.service.d
+	install -d $(SERVICEDIR)/rbdmap.service.d
+	install -m 0644 ceph-after-pve-cluster.conf $(SERVICEDIR)/rbdmap.service.d
+	install -d $(SERVICEDIR)/cephfs-mirror@.service.d
+	install -m 0644 ceph-after-pve-cluster.conf $(SERVICEDIR)/cephfs-mirror@.service.d
 	install -d $(DESTDIR)/usr/share/doc/$(PACKAGE)/examples/
 
 .PHONY: clean
-- 
2.47.3