udev: use ceph-disk trigger ... with single set of udev rules

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/Makefile.am b/Makefile.am
index fcf40707d45c3a2b61d37f606d9af4b6187c8e4a..1fa6e8faa068be8dc294626a25c0d3bc188d1591 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,7 +14,6 @@ EXTRA_DIST += \
        udev/50-rbd.rules \
        udev/60-ceph-partuuid-workaround.rules \
        udev/95-ceph-osd.rules \
-       udev/95-ceph-osd.rules.systemd \
        udev/95-ceph-osd-alt.rules \
        share/known_hosts_drop.ceph.com \
        share/id_dsa_drop.ceph.com \

diff --git a/ceph.spec.in b/ceph.spec.in
index b7a32aa44e48db60390023115c2ef69306acbb56..a8374dc4f35eb52b39431142fe7debb11be5c5cf 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -618,12 +618,8 @@ install -m 0644 -D udev/60-ceph-partuuid-workaround.rules $RPM_BUILD_ROOT%{_udev
 %if (0%{?rhel} && 0%{?rhel} < 7)
 install -m 0644 -D udev/95-ceph-osd-alt.rules $RPM_BUILD_ROOT/lib/udev/rules.d/95-ceph-osd.rules
 %else
-%if 0%{?_with_systemd}
-install -m 0644 -D udev/95-ceph-osd.rules.systemd $RPM_BUILD_ROOT/lib/udev/rules.d/95-ceph-osd.rules
-%else
 install -m 0644 -D udev/95-ceph-osd.rules $RPM_BUILD_ROOT/lib/udev/rules.d/95-ceph-osd.rules
 %endif
-%endif
 
 %if 0%{?rhel} >= 7 || 0%{?fedora} || 0%{?suse_version}
 mv $RPM_BUILD_ROOT/lib/udev/rules.d/95-ceph-osd.rules $RPM_BUILD_ROOT/usr/lib/udev/rules.d/95-ceph-osd.rules

diff --git a/udev/95-ceph-osd.rules b/udev/95-ceph-osd.rules
index 3565f7caf1361015ad72d40c479c7fc0b0fdc1bf..5ad73956f1206201fb121b026e5d3666f5278a99 100644 (file)
--- a/udev/95-ceph-osd.rules
+++ b/udev/95-ceph-osd.rules
@@ -1,53 +1,53 @@
-# activate ceph-tagged partitions
+# OSD_UUID
 ACTION=="add", SUBSYSTEM=="block", \
   ENV{DEVTYPE}=="partition", \
   ENV{ID_PART_ENTRY_TYPE}=="4fbd7e29-9d25-41b8-afd0-062c0ceff05d", \
-  RUN+="/usr/sbin/ceph-disk activate /dev/$name"
+  OWNER:="ceph", GROUP:="ceph", MODE:="660", \
+  RUN+="/usr/sbin/ceph-disk --log-stdout -v trigger /dev/$name"
 
-# activate ceph-tagged partitions
+# JOURNAL_UUID
 ACTION=="add", SUBSYSTEM=="block", \
   ENV{DEVTYPE}=="partition", \
   ENV{ID_PART_ENTRY_TYPE}=="45b0969e-9b03-4f30-b4c6-b4b80ceff106", \
-  RUN+="/usr/sbin/ceph-disk activate-journal /dev/$name"
+  OWNER:="ceph", GROUP:="ceph", MODE:="660", \
+  RUN+="/usr/sbin/ceph-disk --log-stdout -v trigger /dev/$name"
 
-# activate multipath ceph-tagged partitions
+# MPATH_JOURNAL_UUID
 ACTION=="add", SUBSYSTEM=="block", \
   ENV{ID_PART_ENTRY_TYPE}=="4fbd7e29-8ae0-4982-bf9d-5a8d867af560", \
-  RUN+="/usr/sbin/ceph-disk activate /dev/$name"
+  OWNER:="ceph", GROUP:="ceph", MODE:="660", \
+  RUN+="/usr/sbin/ceph-disk --log-stdout -v trigger /dev/$name"
 
-# activate multipath ceph-tagged partitions
+# MATH_OSD_UUID
 ACTION=="add", SUBSYSTEM=="block", \
   ENV{ID_PART_ENTRY_TYPE}=="45b0969e-8ae0-4982-bf9d-5a8d867af560", \
-  RUN+="/usr/sbin/ceph-disk activate-journal /dev/$name"
+  OWNER:="ceph", GROUP:="ceph", MODE:="660", \
+  RUN+="/usr/sbin/ceph-disk --log-stdout -v trigger /dev/$name"
 
-# Map journal if using dm-crypt and plain
+# DMCRYPT_JOURNAL_UUID
 ACTION=="add" SUBSYSTEM=="block", \
   ENV{DEVTYPE}=="partition", \
   ENV{ID_PART_ENTRY_TYPE}=="45b0969e-9b03-4f30-b4c6-5ec00ceff106", \
-  RUN+="/sbin/cryptsetup --key-file /etc/ceph/dmcrypt-keys/$env{ID_PART_ENTRY_UUID} --key-size 256 create $env{ID_PART_ENTRY_UUID} /dev/$name"
+  OWNER:="ceph", GROUP:="ceph", MODE:="660", \
+  RUN+="/usr/sbin/ceph-disk --log-stdout -v trigger /dev/$name"
 
-# Map journal if using dm-crypt and luks
+# DMCRYPT_LUKS_JOURNAL_UUID
 ACTION=="add" SUBSYSTEM=="block", \
   ENV{DEVTYPE}=="partition", \
   ENV{ID_PART_ENTRY_TYPE}=="45b0969e-9b03-4f30-b4c6-35865ceff106", \
-  RUN+="/sbin/cryptsetup --key-file /etc/ceph/dmcrypt-keys/$env{ID_PART_ENTRY_UUID}.luks.key luksOpen /dev/$name $env{ID_PART_ENTRY_UUID}"
+  OWNER:="ceph", GROUP:="ceph", MODE:="660", \
+  RUN+="/usr/sbin/ceph-disk --log-stdout -v trigger /dev/$name"
 
-# Map data device and
-# activate ceph-tagged partitions
-# for dm-crypted data devices and plain
+# DMCRYPT_OID_UUID
 ACTION=="add" SUBSYSTEM=="block", \
   ENV{DEVTYPE}=="partition", \
   ENV{ID_PART_ENTRY_TYPE}=="4fbd7e29-9d25-41b8-afd0-5ec00ceff05d", \
-  RUN+="/sbin/cryptsetup --key-file /etc/ceph/dmcrypt-keys/$env{ID_PART_ENTRY_UUID} --key-size 256 create $env{ID_PART_ENTRY_UUID} /dev/$name", \
-  RUN+="/bin/bash -c 'while [ ! -e /dev/mapper/$env{ID_PART_ENTRY_UUID} ];do sleep 1; done'", \
-  RUN+="/usr/sbin/ceph-disk activate /dev/mapper/$env{ID_PART_ENTRY_UUID}"
+  OWNER:="ceph", GROUP:="ceph", MODE:="660", \
+  RUN+="/usr/sbin/ceph-disk --log-stdout -v trigger /dev/$name"
 
-# Map data device and
-# activate ceph-tagged partitions
-# for dm-crypted data devices and luks
+# DMCRYPT_LUKS_OSD_UUID
 ACTION=="add" SUBSYSTEM=="block", \
   ENV{DEVTYPE}=="partition", \
   ENV{ID_PART_ENTRY_TYPE}=="4fbd7e29-9d25-41b8-afd0-35865ceff05d", \
-  RUN+="/sbin/cryptsetup --key-file /etc/ceph/dmcrypt-keys/$env{ID_PART_ENTRY_UUID}.luks.key luksOpen /dev/$name $env{ID_PART_ENTRY_UUID}", \
-  RUN+="/bin/bash -c 'while [ ! -e /dev/mapper/$env{ID_PART_ENTRY_UUID} ];do sleep 1; done'", \
-  RUN+="/usr/sbin/ceph-disk activate /dev/mapper/$env{ID_PART_ENTRY_UUID}"
+  OWNER:="ceph", GROUP:="ceph", MODE:="660", \
+  RUN+="/usr/sbin/ceph-disk --log-stdout -v trigger /dev/$name"

diff --git a/udev/95-ceph-osd.rules.systemd b/udev/95-ceph-osd.rules.systemd
deleted file mode 100644 (file)
index 235c255..0000000
--- a/udev/95-ceph-osd.rules.systemd
+++ /dev/null
@@ -1,32 +0,0 @@
-# activate ceph-tagged partitions
-ACTION=="add", SUBSYSTEM=="block", \
-  ENV{DEVTYPE}=="partition", \
-  ENV{ID_PART_ENTRY_TYPE}=="4fbd7e29-9d25-41b8-afd0-062c0ceff05d", \
-  OWNER:="ceph", GROUP:="ceph", MODE:="660", \
-  TAG+="systemd", \
-  ENV{SYSTEMD_WANTS}+="ceph-disk-activate@/dev/$name.service"
-
-# activate ceph-tagged partitions
-ACTION=="add", SUBSYSTEM=="block", \
-  ENV{DEVTYPE}=="partition", \
-  ENV{ID_PART_ENTRY_TYPE}=="45b0969e-9b03-4f30-b4c6-b4b80ceff106", \
-  OWNER:="ceph", GROUP:="ceph", MODE:="660", \
-  TAG+="systemd", \
-  ENV{SYSTEMD_WANTS}+="ceph-disk-activate-journal@/dev/$name.service"
-
-# Map journal if using dm-crypt
-ACTION=="add" SUBSYSTEM=="block", \
-  ENV{DEVTYPE}=="partition", \
-  ENV{ID_PART_ENTRY_TYPE}=="45b0969e-9b03-4f30-b4c6-5ec00ceff106", \
-  OWNER:="ceph", GROUP:="ceph", MODE:="660", \
-  RUN+="/sbin/cryptsetup --key-file /etc/ceph/dmcrypt-keys/$env{ID_PART_ENTRY_UUID} --key-size 256 create $env{ID_PART_ENTRY_UUID} /dev/$name"
-
-# Map data device and
-# activate ceph-tagged partitions
-# for dm-crypted data devices
-ACTION=="add" SUBSYSTEM=="block", \
-  ENV{DEVTYPE}=="partition", \
-  ENV{ID_PART_ENTRY_TYPE}=="4fbd7e29-9d25-41b8-afd0-5ec00ceff05d", \
-  OWNER:="ceph", GROUP:="ceph", MODE:="660", \
-  TAG+="systemd", \
-  ENV{SYSTEMD_WANTS}+="ceph-disk-dmcrypt-activate@/dev/$name.service"