diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2024-01-07 00:08:17 +0100 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2024-01-07 00:08:17 +0100 |
| commit | 67d5f5c27727e04d8f8a5ed20e79d5706cbbf1cb (patch) | |
| tree | 56456abe274ed1beb0582c5692689c5ccbf4f983 /roles | |
| parent | update collabora and bump nextcloud versions (diff) | |
refactor: storage roles
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/storage/luks/base/defaults/main.yml (renamed from roles/storage/luks/volumes/defaults/main.yml) | 2 | ||||
| -rw-r--r-- | roles/storage/luks/base/tasks/main.yml (renamed from roles/storage/luks/volumes/tasks/main.yml) | 4 | ||||
| -rw-r--r-- | roles/storage/lvm/base/defaults/main.yml (renamed from roles/storage/lvm/groups/defaults/main.yml) | 0 | ||||
| -rw-r--r-- | roles/storage/lvm/base/tasks/main.yml (renamed from roles/storage/lvm/groups/tasks/main.yml) | 0 | ||||
| -rw-r--r-- | roles/storage/zfs/base/defaults/main.yml (renamed from roles/storage/zfs/pools/defaults/main.yml) | 0 | ||||
| -rw-r--r-- | roles/storage/zfs/base/tasks/Debian.yml (renamed from roles/storage/zfs/pools/tasks/Debian.yml) | 0 | ||||
| -rw-r--r-- | roles/storage/zfs/base/tasks/Ubuntu.yml (renamed from roles/storage/zfs/pools/tasks/Ubuntu.yml) | 0 | ||||
| -rw-r--r-- | roles/storage/zfs/base/tasks/enable-systemd-mount-generator.yml (renamed from roles/storage/zfs/pools/tasks/enable-systemd-mount-generator.yml) | 0 | ||||
| -rw-r--r-- | roles/storage/zfs/base/tasks/main.yml (renamed from roles/storage/zfs/pools/tasks/main.yml) | 0 | ||||
| -rw-r--r-- | roles/storage/zfs/volume/tasks/main.yml | 1 |
10 files changed, 3 insertions, 4 deletions
diff --git a/roles/storage/luks/volumes/defaults/main.yml b/roles/storage/luks/base/defaults/main.yml index 2347231c..c2aa39c6 100644 --- a/roles/storage/luks/volumes/defaults/main.yml +++ b/roles/storage/luks/base/defaults/main.yml @@ -1,5 +1,5 @@ --- -# luks_volumes: +# luks_devices: # crypto-nvme0: # passphrase: "keep-this-very-very-secret" # device: /dev/nvme0n1p3 diff --git a/roles/storage/luks/volumes/tasks/main.yml b/roles/storage/luks/base/tasks/main.yml index 8fdb3019..7fe556a1 100644 --- a/roles/storage/luks/volumes/tasks/main.yml +++ b/roles/storage/luks/base/tasks/main.yml @@ -14,7 +14,7 @@ - name: create luks volumes block: - name: write passphrases into temporary keyfiles - loop: "{{ luks_volumes | dict2items }}" + loop: "{{ luks_devices | dict2items }}" loop_control: label: "{{ item.key }}" copy: @@ -25,7 +25,7 @@ check_mode: False - name: create/open luks volumes - loop: "{{ luks_volumes | dict2items }}" + loop: "{{ luks_devices | dict2items }}" loop_control: label: "{{ item.key }} ({{ item.value.device }})" luks_device: diff --git a/roles/storage/lvm/groups/defaults/main.yml b/roles/storage/lvm/base/defaults/main.yml index 224d35b5..224d35b5 100644 --- a/roles/storage/lvm/groups/defaults/main.yml +++ b/roles/storage/lvm/base/defaults/main.yml diff --git a/roles/storage/lvm/groups/tasks/main.yml b/roles/storage/lvm/base/tasks/main.yml index ddcd49c7..ddcd49c7 100644 --- a/roles/storage/lvm/groups/tasks/main.yml +++ b/roles/storage/lvm/base/tasks/main.yml diff --git a/roles/storage/zfs/pools/defaults/main.yml b/roles/storage/zfs/base/defaults/main.yml index 1566890d..1566890d 100644 --- a/roles/storage/zfs/pools/defaults/main.yml +++ b/roles/storage/zfs/base/defaults/main.yml diff --git a/roles/storage/zfs/pools/tasks/Debian.yml b/roles/storage/zfs/base/tasks/Debian.yml index a1ed0387..a1ed0387 100644 --- a/roles/storage/zfs/pools/tasks/Debian.yml +++ b/roles/storage/zfs/base/tasks/Debian.yml diff --git a/roles/storage/zfs/pools/tasks/Ubuntu.yml b/roles/storage/zfs/base/tasks/Ubuntu.yml index 9745d716..9745d716 100644 --- a/roles/storage/zfs/pools/tasks/Ubuntu.yml +++ b/roles/storage/zfs/base/tasks/Ubuntu.yml diff --git a/roles/storage/zfs/pools/tasks/enable-systemd-mount-generator.yml b/roles/storage/zfs/base/tasks/enable-systemd-mount-generator.yml index 1d50c873..1d50c873 100644 --- a/roles/storage/zfs/pools/tasks/enable-systemd-mount-generator.yml +++ b/roles/storage/zfs/base/tasks/enable-systemd-mount-generator.yml diff --git a/roles/storage/zfs/pools/tasks/main.yml b/roles/storage/zfs/base/tasks/main.yml index 99b8e228..99b8e228 100644 --- a/roles/storage/zfs/pools/tasks/main.yml +++ b/roles/storage/zfs/base/tasks/main.yml diff --git a/roles/storage/zfs/volume/tasks/main.yml b/roles/storage/zfs/volume/tasks/main.yml index 0dc0e82d..260d706d 100644 --- a/roles/storage/zfs/volume/tasks/main.yml +++ b/roles/storage/zfs/volume/tasks/main.yml @@ -1,5 +1,4 @@ --- - ## TODO: implement recursive nesting - name: check volume parent when: "'parent' in zfs_volume" assert: |