diff options
-rw-r--r-- | chaos-at-home/ch-calypso.yml | 2 | ||||
-rw-r--r-- | chaos-at-home/ch-epimetheus.yml | 4 | ||||
-rw-r--r-- | chaos-at-home/ch-equinox-t450s.yml | 2 | ||||
-rw-r--r-- | chaos-at-home/ch-prometheus.yml | 4 | ||||
-rw-r--r-- | chaos-at-home/ch-telesto.yml | 2 | ||||
-rw-r--r-- | dan/sk-2019.yml | 4 | ||||
-rw-r--r-- | dan/sk-2019vm.yml | 4 | ||||
-rw-r--r-- | dan/sk-cloudio.yml | 4 | ||||
-rw-r--r-- | dan/sk-tomnext-nc.yml | 4 | ||||
-rw-r--r-- | dan/sk-tomnext.yml | 4 | ||||
-rw-r--r-- | roles/storage/zfs/info.txt | 1 | ||||
-rw-r--r-- | roles/storage/zfs/pools/defaults/main.yml (renamed from roles/zfs/base/defaults/main.yml) | 0 | ||||
-rw-r--r-- | roles/storage/zfs/pools/tasks/Debian.yml (renamed from roles/zfs/base/tasks/Debian.yml) | 0 | ||||
-rw-r--r-- | roles/storage/zfs/pools/tasks/Ubuntu.yml (renamed from roles/zfs/base/tasks/Ubuntu.yml) | 0 | ||||
-rw-r--r-- | roles/storage/zfs/pools/tasks/enable-systemd-mount-generator.yml (renamed from roles/zfs/base/tasks/enable-systemd-mount-generator.yml) | 0 | ||||
-rw-r--r-- | roles/storage/zfs/pools/tasks/main.yml (renamed from roles/zfs/base/tasks/main.yml) | 4 | ||||
-rw-r--r-- | roles/storage/zfs/sanoid/defaults/main.yml (renamed from roles/zfs/sanoid/defaults/main.yml) | 0 | ||||
-rw-r--r-- | roles/storage/zfs/sanoid/tasks/main.yml (renamed from roles/zfs/sanoid/tasks/main.yml) | 0 | ||||
-rw-r--r-- | roles/storage/zfs/sanoid/templates/sanoid.conf.j2 (renamed from roles/zfs/sanoid/templates/sanoid.conf.j2) | 0 | ||||
-rw-r--r-- | spreadspace/s2-thetys.yml | 2 |
20 files changed, 21 insertions, 20 deletions
diff --git a/chaos-at-home/ch-calypso.yml b/chaos-at-home/ch-calypso.yml index 632132c8..962b9aa3 100644 --- a/chaos-at-home/ch-calypso.yml +++ b/chaos-at-home/ch-calypso.yml @@ -8,7 +8,7 @@ - role: core/zsh - role: core/ntp - role: core/cpu-microcode - - role: zfs/base + - role: storage/zfs/pools - role: apt-repo/obs-studio - role: apt-repo/spreadspace - role: ws/base diff --git a/chaos-at-home/ch-epimetheus.yml b/chaos-at-home/ch-epimetheus.yml index ea1b5617..105426be 100644 --- a/chaos-at-home/ch-epimetheus.yml +++ b/chaos-at-home/ch-epimetheus.yml @@ -9,9 +9,9 @@ - role: core/ntp - role: network/wakeonlan - role: storage/luks/volumes - - role: zfs/base + - role: storage/zfs/pools - role: apt-repo/spreadspace - - role: zfs/sanoid + - role: storage/zfs/sanoid post_tasks: - name: install simple suspend script copy: diff --git a/chaos-at-home/ch-equinox-t450s.yml b/chaos-at-home/ch-equinox-t450s.yml index 0a41d740..afc81fa3 100644 --- a/chaos-at-home/ch-equinox-t450s.yml +++ b/chaos-at-home/ch-equinox-t450s.yml @@ -13,7 +13,7 @@ - role: apt-repo/kubernetes - role: apt-repo/riot - role: apt-repo/nordvpn - - role: zfs/base + - role: storage/zfs/pools - role: ws/base - role: core/admin-users - role: network/wireguard/base diff --git a/chaos-at-home/ch-prometheus.yml b/chaos-at-home/ch-prometheus.yml index 4d6563d4..6bcba16f 100644 --- a/chaos-at-home/ch-prometheus.yml +++ b/chaos-at-home/ch-prometheus.yml @@ -8,9 +8,9 @@ - role: core/zsh - role: core/cpu-microcode - role: storage/luks/volumes - - role: zfs/base + - role: storage/zfs/pools - role: apt-repo/spreadspace - - role: zfs/sanoid + - role: storage/zfs/sanoid - role: chaos-at-home/fileserver - role: vm/host/base - role: vm/host/network diff --git a/chaos-at-home/ch-telesto.yml b/chaos-at-home/ch-telesto.yml index 68d9595d..9cbfbde3 100644 --- a/chaos-at-home/ch-telesto.yml +++ b/chaos-at-home/ch-telesto.yml @@ -8,7 +8,7 @@ - role: core/zsh - role: core/ntp - role: core/cpu-microcode - - role: zfs/base + - role: storage/zfs/pools - role: apt-repo/obs-studio - role: apt-repo/spreadspace - role: ws/base diff --git a/dan/sk-2019.yml b/dan/sk-2019.yml index d018c483..117fe0f7 100644 --- a/dan/sk-2019.yml +++ b/dan/sk-2019.yml @@ -9,9 +9,9 @@ - role: core/cpu-microcode - role: core/admin-users - role: storage/luks/volumes - - role: zfs/base + - role: storage/zfs/pools - role: apt-repo/spreadspace - - role: zfs/sanoid + - role: storage/zfs/sanoid tasks: - name: install post-boot script copy: diff --git a/dan/sk-2019vm.yml b/dan/sk-2019vm.yml index 76766433..68ec29ef 100644 --- a/dan/sk-2019vm.yml +++ b/dan/sk-2019vm.yml @@ -9,9 +9,9 @@ - role: core/cpu-microcode - role: core/admin-users - role: storage/luks/volumes - - role: zfs/base + - role: storage/zfs/pools - role: apt-repo/spreadspace - - role: zfs/sanoid + - role: storage/zfs/sanoid - role: vm/host/base - role: vm/host/network - role: installer/debian/base diff --git a/dan/sk-cloudio.yml b/dan/sk-cloudio.yml index c3e80838..a23368b5 100644 --- a/dan/sk-cloudio.yml +++ b/dan/sk-cloudio.yml @@ -8,9 +8,9 @@ - role: core/zsh - role: core/cpu-microcode - role: core/admin-users - - role: zfs/base + - role: storage/zfs/pools - role: apt-repo/spreadspace - - role: zfs/sanoid + - role: storage/zfs/sanoid - role: kubernetes/base - role: kubernetes/standalone/base - role: acmetool/base diff --git a/dan/sk-tomnext-nc.yml b/dan/sk-tomnext-nc.yml index 3924551a..0349d69d 100644 --- a/dan/sk-tomnext-nc.yml +++ b/dan/sk-tomnext-nc.yml @@ -7,9 +7,9 @@ - role: core/sshd - role: core/zsh - role: core/admin-users - - role: zfs/base + - role: storage/zfs/pools - role: apt-repo/spreadspace - - role: zfs/sanoid + - role: storage/zfs/sanoid - role: kubernetes/base - role: kubernetes/standalone/base - role: acmetool/base diff --git a/dan/sk-tomnext.yml b/dan/sk-tomnext.yml index 2e3127e3..e866a8d7 100644 --- a/dan/sk-tomnext.yml +++ b/dan/sk-tomnext.yml @@ -9,9 +9,9 @@ - role: core/cpu-microcode - role: core/admin-users - role: storage/luks/volumes - - role: zfs/base + - role: storage/zfs/pools - role: apt-repo/spreadspace - - role: zfs/sanoid + - role: storage/zfs/sanoid - role: vm/host/base - role: vm/host/network - role: installer/debian/base diff --git a/roles/storage/zfs/info.txt b/roles/storage/zfs/info.txt new file mode 100644 index 00000000..6a838617 --- /dev/null +++ b/roles/storage/zfs/info.txt @@ -0,0 +1 @@ +https://jrs-s.net/2018/08/17/zfs-tuning-cheat-sheet/ diff --git a/roles/zfs/base/defaults/main.yml b/roles/storage/zfs/pools/defaults/main.yml index dcef7628..dcef7628 100644 --- a/roles/zfs/base/defaults/main.yml +++ b/roles/storage/zfs/pools/defaults/main.yml diff --git a/roles/zfs/base/tasks/Debian.yml b/roles/storage/zfs/pools/tasks/Debian.yml index a1ed0387..a1ed0387 100644 --- a/roles/zfs/base/tasks/Debian.yml +++ b/roles/storage/zfs/pools/tasks/Debian.yml diff --git a/roles/zfs/base/tasks/Ubuntu.yml b/roles/storage/zfs/pools/tasks/Ubuntu.yml index 9745d716..9745d716 100644 --- a/roles/zfs/base/tasks/Ubuntu.yml +++ b/roles/storage/zfs/pools/tasks/Ubuntu.yml diff --git a/roles/zfs/base/tasks/enable-systemd-mount-generator.yml b/roles/storage/zfs/pools/tasks/enable-systemd-mount-generator.yml index eaa3cebe..eaa3cebe 100644 --- a/roles/zfs/base/tasks/enable-systemd-mount-generator.yml +++ b/roles/storage/zfs/pools/tasks/enable-systemd-mount-generator.yml diff --git a/roles/zfs/base/tasks/main.yml b/roles/storage/zfs/pools/tasks/main.yml index 732c3346..1a6b911d 100644 --- a/roles/zfs/base/tasks/main.yml +++ b/roles/storage/zfs/pools/tasks/main.yml @@ -18,8 +18,8 @@ - name: install zed and zfs file system utilities apt: name: - - zfsutils-linux - - zfs-zed + - zfsutils-linux + - zfs-zed state: present - name: enable systemd mount-generator diff --git a/roles/zfs/sanoid/defaults/main.yml b/roles/storage/zfs/sanoid/defaults/main.yml index f48e9fd2..f48e9fd2 100644 --- a/roles/zfs/sanoid/defaults/main.yml +++ b/roles/storage/zfs/sanoid/defaults/main.yml diff --git a/roles/zfs/sanoid/tasks/main.yml b/roles/storage/zfs/sanoid/tasks/main.yml index e35190e9..e35190e9 100644 --- a/roles/zfs/sanoid/tasks/main.yml +++ b/roles/storage/zfs/sanoid/tasks/main.yml diff --git a/roles/zfs/sanoid/templates/sanoid.conf.j2 b/roles/storage/zfs/sanoid/templates/sanoid.conf.j2 index 82eb27a9..82eb27a9 100644 --- a/roles/zfs/sanoid/templates/sanoid.conf.j2 +++ b/roles/storage/zfs/sanoid/templates/sanoid.conf.j2 diff --git a/spreadspace/s2-thetys.yml b/spreadspace/s2-thetys.yml index 2a7cd29f..a3edf5c2 100644 --- a/spreadspace/s2-thetys.yml +++ b/spreadspace/s2-thetys.yml @@ -10,7 +10,7 @@ - role: apt-repo/spreadspace - role: network/wireguard/base - role: network/wireguard/p2p - - role: zfs/base + - role: storage/zfs/pools - role: streaming/blackmagic/desktopvideo - role: kubernetes/base - role: kubernetes/standalone/base |