systemd: consolidate into a single ceph-disk@.service

This simple service will 'ceph-disk trigger DEV --sync'. Signed-off-by: Sage Weil <sage@redhat.com>
ceph · Sep 1, 2015 · f1b80e9 · f1b80e9
1 parent 82acd5e
commit f1b80e9
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 26 deletions.
diff --git a/ceph.spec.in b/ceph.spec.in
@@ -591,9 +591,7 @@ install -D etc/ceph.limits.d $RPM_BUILD_ROOT%{_sysconfdir}/security/limits.d/cep
   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
-  install -m 0644 -D systemd/ceph-disk-activate-journal@.service $RPM_BUILD_ROOT%{_unitdir}/ceph-disk-activate-journal@.service
-  install -m 0644 -D systemd/ceph-disk-activate@.service $RPM_BUILD_ROOT%{_unitdir}/ceph-disk-activate@.service
-  install -m 0644 -D systemd/ceph-disk-dmcrypt-activate@.service $RPM_BUILD_ROOT%{_unitdir}/ceph-disk-dmcrypt-activate@.service
+  install -m 0644 -D systemd/ceph-disk@.service $RPM_BUILD_ROOT%{_unitdir}/ceph-disk@.service
   install -m 0755 -D systemd/ceph $RPM_BUILD_ROOT%{_sbindir}/rcceph
 %else
   install -D src/init-ceph $RPM_BUILD_ROOT%{_initrddir}/ceph
@@ -747,9 +745,7 @@ mkdir -p %{_localstatedir}/run/ceph/
 %{_unitdir}/ceph-create-keys@.service
 %{_unitdir}/ceph-osd@.service
 %{_unitdir}/ceph-radosgw@.service
-%{_unitdir}/ceph-disk-activate-journal@.service
-%{_unitdir}/ceph-disk-activate@.service
-%{_unitdir}/ceph-disk-dmcrypt-activate@.service
+%{_unitdir}/ceph-disk@.service
 %{_unitdir}/ceph.target
 %else
 %{_initrddir}/ceph

diff --git a/systemd/Makefile.am b/systemd/Makefile.am
@@ -5,9 +5,7 @@ unitfiles = \
 	ceph-create-keys@.service \
 	ceph-osd@.service \
 	ceph-radosgw@.service \
-	ceph-disk-activate-journal@.service \
-	ceph-disk-activate@.service \
-	ceph-disk-dmcrypt-activate@.service
+	ceph-disk@.service
 
 unitdir = $(systemd_unit_dir)
 

diff --git a/systemd/ceph-disk-activate-journal@.service b/systemd/ceph-disk-activate-journal@.service
diff --git a/systemd/ceph-disk-dmcrypt-activate@.service b/systemd/ceph-disk-dmcrypt-activate@.service
diff --git a/systemd/ceph-disk-activate@.service → systemd/ceph-disk@.service b/systemd/ceph-disk-activate@.service → systemd/ceph-disk@.service
@@ -4,5 +4,5 @@ Description=Ceph disk activation: %f
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=/usr/sbin/ceph-disk --verbose --log-stdout activate --mark-init systemd %f
+ExecStart=/usr/sbin/ceph-disk --verbose --log-stdout trigger --sync %f
 TimeoutSec=0