diff options
| -rw-r--r-- | dan/sk-2019.yml | 28 | ||||
| -rw-r--r-- | inventory/host_vars/sk-2019.yml | 4 | ||||
| -rw-r--r-- | inventory/host_vars/sk-2019vm.yml | 4 | ||||
| -rw-r--r-- | inventory/host_vars/sk-cloudia.yml | 4 | ||||
| -rw-r--r-- | roles/zfs/base/defaults/main.yml | 4 | ||||
| -rw-r--r-- | roles/zfs/base/tasks/main.yml | 8 |
6 files changed, 39 insertions, 13 deletions
diff --git a/dan/sk-2019.yml b/dan/sk-2019.yml index 16045795..058f2732 100644 --- a/dan/sk-2019.yml +++ b/dan/sk-2019.yml @@ -8,6 +8,21 @@ - role: admin-user - role: cryptdisk - role: zfs/base + tasks: + - name: install post-boot script + copy: + dest: /usr/local/bin/post-boot + mode: 0755 + content: | + #!/bin/bash + set -e + + {% for name, volume in cryptdisk_volumes.items() %} + cryptsetup luksOpen '{{ volume.device }}' '{{ name }}' + {% endfor %} + systemctl restart zfs-import-cache.service + systemctl restart zfs-mount.service + mount -a ### TODO: # @@ -32,16 +47,3 @@ # # mount -a # -# -### write script to /usr/local/bin/post-boot -## -## #!/bin/bash -## set -e -## cryptsetup luksOpen /dev/disk/by-id/nvme-eui.0025388791050fef-part3 crypto-nvme0 -## cryptsetup luksOpen /dev/disk/by-id/nvme-eui.0025388791050fdc-part3 crypto-nvme1 -## systemctl restart zfs-import-cache.service -## systemctl restart zfs-mount.service -## mount -a -# -# chmod +x /usr/local/bin/post-boot -# diff --git a/inventory/host_vars/sk-2019.yml b/inventory/host_vars/sk-2019.yml index 9aea3d06..80491c40 100644 --- a/inventory/host_vars/sk-2019.yml +++ b/inventory/host_vars/sk-2019.yml @@ -28,3 +28,7 @@ cryptdisk_volumes: zfs_zpool_name: storage zfs_zpool_mountpoint: /srv/storage zfs_zpool_create_vdevs: mirror /dev/mapper/crypto-nvme0 /dev/mapper/crypto-nvme1 + +# zfs_arc_size: +# min: "{{ 2 * 1024 * 1024 * 1024 }}" +# max: "{{ 16 * 1024 * 1024 * 1024 }}" diff --git a/inventory/host_vars/sk-2019vm.yml b/inventory/host_vars/sk-2019vm.yml index c0578ab9..252685f2 100644 --- a/inventory/host_vars/sk-2019vm.yml +++ b/inventory/host_vars/sk-2019vm.yml @@ -36,3 +36,7 @@ cryptdisk_volumes: zfs_zpool_name: storage zfs_zpool_mountpoint: /srv/storage zfs_zpool_create_vdevs: mirror /dev/mapper/crypto-nvme0 /dev/mapper/crypto-nvme1 + +zfs_arc_size: + min: "{{ 2 * 1024 * 1024 * 1024 }}" + max: "{{ 8 * 1024 * 1024 * 1024 }}" diff --git a/inventory/host_vars/sk-cloudia.yml b/inventory/host_vars/sk-cloudia.yml index 67914d50..1f4c542b 100644 --- a/inventory/host_vars/sk-cloudia.yml +++ b/inventory/host_vars/sk-cloudia.yml @@ -12,3 +12,7 @@ network: {} zfs_zpool_name: storage zfs_zpool_mountpoint: /srv/storage zfs_zpool_create_vdevs: mirror nvme0n1p3 nvme1n1p3 + +zfs_arc_size: + min: "{{ 2 * 1024 * 1024 * 1024 }}" + max: "{{ 16 * 1024 * 1024 * 1024 }}" diff --git a/roles/zfs/base/defaults/main.yml b/roles/zfs/base/defaults/main.yml index 917f3d84..06218f6b 100644 --- a/roles/zfs/base/defaults/main.yml +++ b/roles/zfs/base/defaults/main.yml @@ -5,3 +5,7 @@ zfs_zpool_properties: # zfs_zpool_name: storage # zfs_zpool_mountpoint: /srv/storage # zfs_zpool_create_vdevs: mirror sda sdb mirror sdc sdd log mirror nvme0n1p3 nvme1n1p3 cache nvme0n1p4 nvme1n1p4 + +#zfs_arc_size: +# min: {{ 2 * 1024 * 1024 * 1024 }} +# max: {{ 8 * 1024 * 1024 * 1024 }} diff --git a/roles/zfs/base/tasks/main.yml b/roles/zfs/base/tasks/main.yml index cddfbb09..3f1e8416 100644 --- a/roles/zfs/base/tasks/main.yml +++ b/roles/zfs/base/tasks/main.yml @@ -1,4 +1,12 @@ --- +- name: configure arc size + when: zfs_arc_size is defined + copy: + content: | + options zfs zfs_arc_min={{ zfs_arc_size.min }} + options zfs zfs_arc_max={{ zfs_arc_size.max }} + dest: /etc/modprobe.d/zfs.conf + ## TODO: @debian: make sure contrib repo is added - name: install zfs packages |