From 1f78b84b11e8550e6dec59fa2f8fc2632def9cc9 Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Sun, 9 Aug 2015 22:49:25 +0200 Subject: [PATCH] osd.rules.systemd: add entries to handle LUKS partitions Signed-off-by: David Disseldorp (cherry picked from commit c3df07b6f9ab24977db891c70c4fb01a69512c7c) --- udev/95-ceph-osd.rules.systemd | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/udev/95-ceph-osd.rules.systemd b/udev/95-ceph-osd.rules.systemd index dccfe34f84b85..116d353253521 100644 --- a/udev/95-ceph-osd.rules.systemd +++ b/udev/95-ceph-osd.rules.systemd @@ -12,17 +12,32 @@ ACTION=="add", SUBSYSTEM=="block", \ TAG+="systemd", \ ENV{SYSTEMD_WANTS}+="ceph-disk-activate-journal@/dev/$name.service" -# Map journal if using dm-crypt +# Map journal if using dm-crypt and plain 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" +# Map journal if using dm-crypt and luks +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}" + # Map data device and # activate ceph-tagged partitions -# for dm-crypted data devices +# for dm-crypted data devices and plain ACTION=="add" SUBSYSTEM=="block", \ ENV{DEVTYPE}=="partition", \ ENV{ID_PART_ENTRY_TYPE}=="4fbd7e29-9d25-41b8-afd0-5ec00ceff05d", \ TAG+="systemd", \ ENV{SYSTEMD_WANTS}+="ceph-disk-dmcrypt-activate@/dev/$name.service" + +# Map data device and +# activate ceph-tagged partitions +# for dm-crypted data devices and luks +ACTION=="add" SUBSYSTEM=="block", \ + ENV{DEVTYPE}=="partition", \ + ENV{ID_PART_ENTRY_TYPE}=="4fbd7e29-9d25-41b8-afd0-35865ceff05d", \ + TAG+="systemd", \ + ENV{SYSTEMD_WANTS}+="ceph-disk-dmcrypt-activate@/dev/$name.service" -- 2.39.5