From 4f77172fbabd0011e9adb745f9160b43b3816c06 Mon Sep 17 00:00:00 2001
From: Joshua Schmid <jschmid@suse.com>
Date: Tue, 25 Aug 2015 11:53:28 +0200
Subject: [PATCH] Change udev files for systemd (adapt dmcrypt+luks journal
 TYPE)

Signed-off-by: Joshua Schmid <jschmid@suse.com>
(cherry picked from commit 18a6b23df3b2fa5e8b69ed14f7a2af5e9c1faf40)
---
 udev/95-ceph-osd.rules         |  2 +-
 udev/95-ceph-osd.rules.systemd | 30 ++++++++++++++----------------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/udev/95-ceph-osd.rules b/udev/95-ceph-osd.rules
index 5a881cf317aa2..4be0d3821db3e 100644
--- a/udev/95-ceph-osd.rules
+++ b/udev/95-ceph-osd.rules
@@ -22,7 +22,7 @@ ACTION=="add" SUBSYSTEM=="block", \
 # ceph journal dmcrypt + luks
 ACTION=="add" SUBSYSTEM=="block", \
   ENV{DEVTYPE}=="partition", \
-  ENV{ID_PART_ENTRY_TYPE}=="45b0969e-9b03-4f30-b4c6-5ec00ceff106", \
+  ENV{ID_PART_ENTRY_TYPE}=="45b0969e-9b03-4f30-b4c6-35865ceff106", \
   TAG+="systemd", \
   ENV{SYSTEMD_WANTS}+="ceph-disk-activate-journal@/dev/$name.service"
 
diff --git a/udev/95-ceph-osd.rules.systemd b/udev/95-ceph-osd.rules.systemd
index 116d353253521..4be0d3821db3e 100644
--- a/udev/95-ceph-osd.rules.systemd
+++ b/udev/95-ceph-osd.rules.systemd
@@ -1,43 +1,41 @@
-# activate ceph-tagged partitions
+# ceph data no dmcrypt
 ACTION=="add", SUBSYSTEM=="block", \
   ENV{DEVTYPE}=="partition", \
   ENV{ID_PART_ENTRY_TYPE}=="4fbd7e29-9d25-41b8-afd0-062c0ceff05d", \
   TAG+="systemd", \
   ENV{SYSTEMD_WANTS}+="ceph-disk-activate@/dev/$name.service"
 
-# activate ceph-tagged partitions
+# ceph journal no dmcrypt
 ACTION=="add", SUBSYSTEM=="block", \
   ENV{DEVTYPE}=="partition", \
   ENV{ID_PART_ENTRY_TYPE}=="45b0969e-9b03-4f30-b4c6-b4b80ceff106", \
   TAG+="systemd", \
   ENV{SYSTEMD_WANTS}+="ceph-disk-activate-journal@/dev/$name.service"
 
-# Map journal if using dm-crypt and plain
+# ceph data dmcrypt + luks
 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"
+  ENV{ID_PART_ENTRY_TYPE}=="4fbd7e29-9d25-41b8-afd0-35865ceff05d", \
+  TAG+="systemd", \
+  ENV{SYSTEMD_WANTS}+="ceph-disk-activate@/dev/$name.service"
 
-# Map journal if using dm-crypt and luks
+# ceph journal dmcrypt + 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}"
+  TAG+="systemd", \
+  ENV{SYSTEMD_WANTS}+="ceph-disk-activate-journal@/dev/$name.service"
 
-# Map data device and
-# activate ceph-tagged partitions
-# for dm-crypted data devices and plain
+# ceph data dmcrypt without luks
 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"
+  ENV{SYSTEMD_WANTS}+="ceph-disk-activate@/dev/$name.service"
 
-# Map data device and
-# activate ceph-tagged partitions
-# for dm-crypted data devices and luks
+# ceph journal dmcrypt without luks
 ACTION=="add" SUBSYSTEM=="block", \
   ENV{DEVTYPE}=="partition", \
-  ENV{ID_PART_ENTRY_TYPE}=="4fbd7e29-9d25-41b8-afd0-35865ceff05d", \
+  ENV{ID_PART_ENTRY_TYPE}=="45b0969e-9b03-4f30-b4c6-5ec00ceff106", \
   TAG+="systemd", \
-  ENV{SYSTEMD_WANTS}+="ceph-disk-dmcrypt-activate@/dev/$name.service"
+  ENV{SYSTEMD_WANTS}+="ceph-disk-activate-journal@/dev/$name.service"
-- 
2.39.5