From 7fa7e2931d1affa9692cbaa186133240b8280e9f Mon Sep 17 00:00:00 2001
From: Wojciech Kozlowski <wk@wojciechkozlowski.eu>
Date: Sun, 17 Sep 2023 08:09:25 -0700
Subject: [PATCH] Remove ZFS load key

---
 inventory/host_vars/yggdrasil/vars.yml        |  2 --
 playbooks/roles/system/zfs/defaults/main.yml  |  1 -
 .../zfs/files/load_key/zfs-load-key@.service  | 17 ----------------
 .../roles/system/zfs/meta/argument_specs.yml  |  4 ----
 .../system/zfs/tasks/include/load_key.yml     | 20 -------------------
 playbooks/roles/system/zfs/tasks/main.yml     |  4 ----
 6 files changed, 48 deletions(-)
 delete mode 100644 playbooks/roles/system/zfs/files/load_key/zfs-load-key@.service
 delete mode 100644 playbooks/roles/system/zfs/tasks/include/load_key.yml

diff --git a/inventory/host_vars/yggdrasil/vars.yml b/inventory/host_vars/yggdrasil/vars.yml
index 427e0c3..770c753 100644
--- a/inventory/host_vars/yggdrasil/vars.yml
+++ b/inventory/host_vars/yggdrasil/vars.yml
@@ -9,8 +9,6 @@ system_zfs_zpools:
 system_zfs_zpools_trim:
   - "bpool"
   - "rpool"
-system_zfs_zpools_load_key:
-  - "hpool"
 
 # --------------------------------------------------------------------------------------------------
 # system:mail
diff --git a/playbooks/roles/system/zfs/defaults/main.yml b/playbooks/roles/system/zfs/defaults/main.yml
index 6da8094..7a149bc 100644
--- a/playbooks/roles/system/zfs/defaults/main.yml
+++ b/playbooks/roles/system/zfs/defaults/main.yml
@@ -1,4 +1,3 @@
 ---
 system_zfs_zpools: []
 system_zfs_zpools_trim: []
-system_zfs_zpools_load_key: []
diff --git a/playbooks/roles/system/zfs/files/load_key/zfs-load-key@.service b/playbooks/roles/system/zfs/files/load_key/zfs-load-key@.service
deleted file mode 100644
index 04c5e93..0000000
--- a/playbooks/roles/system/zfs/files/load_key/zfs-load-key@.service
+++ /dev/null
@@ -1,17 +0,0 @@
-[Unit]
-Description=Load encryption key for a ZFS pool
-Documentation=man:zfs(8)
-DefaultDependencies=no
-After=systemd-udev-settle.service
-After=zfs-import.target
-After=systemd-remount-fs.service
-Before=zfs-mount.service
-ConditionPathIsDirectory=/sys/module/zfs
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/sbin/zfs load-key %i
-
-[Install]
-WantedBy=zfs.target
diff --git a/playbooks/roles/system/zfs/meta/argument_specs.yml b/playbooks/roles/system/zfs/meta/argument_specs.yml
index 1e10527..e449829 100644
--- a/playbooks/roles/system/zfs/meta/argument_specs.yml
+++ b/playbooks/roles/system/zfs/meta/argument_specs.yml
@@ -13,7 +13,3 @@ argument_specs:
         type: "list"
         elements: "str"
         required: true
-      system_zfs_zpools_load_key:
-        type: "list"
-        elements: "str"
-        required: true
diff --git a/playbooks/roles/system/zfs/tasks/include/load_key.yml b/playbooks/roles/system/zfs/tasks/include/load_key.yml
deleted file mode 100644
index 9135e30..0000000
--- a/playbooks/roles/system/zfs/tasks/include/load_key.yml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-- name: "load_key : zfs load key service file"
-  ansible.builtin.copy:
-    src: "./load_key/zfs-load-key@.service"
-    dest: "/etc/systemd/system/zfs-load-key@.service"
-    mode: 0644
-  register: system_zfs_load_key_service_file
-
-- name: "load_key : systemd daemon reload"
-  ansible.builtin.systemd:
-    daemon_reload: true
-  when:
-    system_zfs_load_key_service_file.changed
-
-- name: "load_key : enable service to load key for {{ item }}"
-  ansible.builtin.systemd:
-    name: "zfs-load-key@{{ item }}.service"
-    enabled: true
-    state: "started"
-  loop: "{{ system_zfs_zpools_load_key }}"
diff --git a/playbooks/roles/system/zfs/tasks/main.yml b/playbooks/roles/system/zfs/tasks/main.yml
index f5ab28d..edd60ed 100644
--- a/playbooks/roles/system/zfs/tasks/main.yml
+++ b/playbooks/roles/system/zfs/tasks/main.yml
@@ -14,7 +14,3 @@
 - name: "play:system : role:zfs : tasks:scrub"
   ansible.builtin.import_tasks: "include/scrub.yml"
   tags: "system:zfs:scrub"
-
-- name: "play:system : role:zfs : tasks:load_key"
-  ansible.builtin.import_tasks: "include/load_key.yml"
-  tags: "system:zfs:load_key"