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>

diff --git a/ceph.spec.in b/ceph.spec.in
index 6dd925290e2debeb12835696a3185a9c2770f72a..b7a32aa44e48db60390023115c2ef69306acbb56 100644 (file)
--- 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
index e6d73e7facca67d82475aef698e86c048a5bc3bb..3db6c85f5d8afa6702326e7733ee9ff38f99ad9d 100644 (file)
--- 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
deleted file mode 100644 (file)
index ac7cb46..0000000
--- a/systemd/ceph-disk-activate-journal@.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Ceph disk journal activation: %f
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/usr/sbin/ceph-disk --verbose --log-stdout activate-journal --mark-init systemd %f
-TimeoutSec=0

diff --git a/systemd/ceph-disk-activate@.service b/systemd/ceph-disk-activate@.service
deleted file mode 100644 (file)
index b6e75af..0000000
--- a/systemd/ceph-disk-activate@.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Ceph disk activation: %f
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/usr/sbin/ceph-disk --verbose --log-stdout activate --mark-init systemd %f
-TimeoutSec=0

diff --git a/systemd/ceph-disk-dmcrypt-activate@.service b/systemd/ceph-disk-dmcrypt-activate@.service
deleted file mode 100644 (file)
index b17df10..0000000
--- a/systemd/ceph-disk-dmcrypt-activate@.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Ceph disk dmcrypt activation: %f
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/usr/sbin/ceph-disk --verbose --log-stdout activate --dmcrypt --mark-init systemd %f
-TimeoutSec=0

diff --git a/systemd/ceph-disk@.service b/systemd/ceph-disk@.service
new file mode 100644 (file)
index 0000000..88e4aef
--- /dev/null
+++ b/systemd/ceph-disk@.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Ceph disk activation: %f
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/sbin/ceph-disk --verbose --log-stdout trigger --sync %f
+TimeoutSec=0