diff options
| -rw-r--r-- | inventory/host_vars/ch-oulu.yml | 4 | ||||
| -rw-r--r-- | inventory/host_vars/ch-prometheus.yml | 4 | ||||
| -rw-r--r-- | inventory/host_vars/s2-thetys.yml | 4 | ||||
| -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/vars.yml | 4 | ||||
| -rw-r--r-- | inventory/host_vars/sk-cloudio/vars.yml | 4 | ||||
| -rw-r--r-- | inventory/host_vars/sk-tomnext-nc.yml | 4 | ||||
| -rw-r--r-- | inventory/host_vars/sk-tomnext.yml | 4 | ||||
| -rw-r--r-- | roles/zfs/base/defaults/main.yml | 4 | ||||
| -rw-r--r-- | roles/zfs/base/tasks/main.yml | 4 |
11 files changed, 22 insertions, 22 deletions
diff --git a/inventory/host_vars/ch-oulu.yml b/inventory/host_vars/ch-oulu.yml index b45e3b24..f39f04f9 100644 --- a/inventory/host_vars/ch-oulu.yml +++ b/inventory/host_vars/ch-oulu.yml @@ -41,8 +41,8 @@ apt_repo_components: zfs_arc_size: - min: "{{ 2 * 1024 * 1024 * 1024 }}" - max: "{{ 8 * 1024 * 1024 * 1024 }}" + min: 2GB + max: 8GB zfs_pools: nvme: diff --git a/inventory/host_vars/ch-prometheus.yml b/inventory/host_vars/ch-prometheus.yml index d55d2c87..3b4a3899 100644 --- a/inventory/host_vars/ch-prometheus.yml +++ b/inventory/host_vars/ch-prometheus.yml @@ -69,8 +69,8 @@ cryptdisk_volumes: zfs_arc_size: - min: "{{ 2 * 1024 * 1024 * 1024 }}" - max: "{{ 24 * 1024 * 1024 * 1024 }}" + min: 2GB + max: 24GB zfs_pools: nvme: diff --git a/inventory/host_vars/s2-thetys.yml b/inventory/host_vars/s2-thetys.yml index c634a7c1..d2038d7b 100644 --- a/inventory/host_vars/s2-thetys.yml +++ b/inventory/host_vars/s2-thetys.yml @@ -50,8 +50,8 @@ kubernetes_standalone_cni_variant: with-portmap zfs_arc_size: - min: "{{ 2 * 1024 * 1024 * 1024 }}" - max: "{{ 4 * 1024 * 1024 * 1024 }}" + min: 2GB + max: 4GB zfs_pools: storage: diff --git a/inventory/host_vars/sk-2019.yml b/inventory/host_vars/sk-2019.yml index 5259a390..24c5fc48 100644 --- a/inventory/host_vars/sk-2019.yml +++ b/inventory/host_vars/sk-2019.yml @@ -41,8 +41,8 @@ cryptdisk_volumes: zfs_arc_size: - min: "{{ 2 * 1024 * 1024 * 1024 }}" - max: "{{ 12 * 1024 * 1024 * 1024 }}" + min: 2GB + max: 12GB zfs_pools: storage: diff --git a/inventory/host_vars/sk-2019vm.yml b/inventory/host_vars/sk-2019vm.yml index 173c89e8..404a8d37 100644 --- a/inventory/host_vars/sk-2019vm.yml +++ b/inventory/host_vars/sk-2019vm.yml @@ -41,8 +41,8 @@ cryptdisk_volumes: zfs_arc_size: - min: "{{ 2 * 1024 * 1024 * 1024 }}" - max: "{{ 8 * 1024 * 1024 * 1024 }}" + min: 2GB + max: 8GB zfs_pools: storage: diff --git a/inventory/host_vars/sk-cloudia/vars.yml b/inventory/host_vars/sk-cloudia/vars.yml index fb390f3c..3d111d29 100644 --- a/inventory/host_vars/sk-cloudia/vars.yml +++ b/inventory/host_vars/sk-cloudia/vars.yml @@ -35,8 +35,8 @@ cryptdisk_volumes: zfs_arc_size: - min: "{{ 2 * 1024 * 1024 * 1024 }}" - max: "{{ 12 * 1024 * 1024 * 1024 }}" + min: 2GB + max: 12GB zfs_pools: storage: diff --git a/inventory/host_vars/sk-cloudio/vars.yml b/inventory/host_vars/sk-cloudio/vars.yml index 8bcb670e..00bcdfde 100644 --- a/inventory/host_vars/sk-cloudio/vars.yml +++ b/inventory/host_vars/sk-cloudio/vars.yml @@ -23,8 +23,8 @@ apt_repo_components: zfs_arc_size: - min: "{{ 2 * 1024 * 1024 * 1024 }}" - max: "{{ 16 * 1024 * 1024 * 1024 }}" + min: 2GB + max: 16GB zfs_pools: storage: diff --git a/inventory/host_vars/sk-tomnext-nc.yml b/inventory/host_vars/sk-tomnext-nc.yml index c22925d1..9b7790ee 100644 --- a/inventory/host_vars/sk-tomnext-nc.yml +++ b/inventory/host_vars/sk-tomnext-nc.yml @@ -44,8 +44,8 @@ apt_repo_components: zfs_arc_size: - min: "{{ 2 * 1024 * 1024 * 1024 }}" - max: "{{ 8 * 1024 * 1024 * 1024 }}" + min: 2GB + max: 8GB zfs_pools: storage: diff --git a/inventory/host_vars/sk-tomnext.yml b/inventory/host_vars/sk-tomnext.yml index 718a9285..3a71899a 100644 --- a/inventory/host_vars/sk-tomnext.yml +++ b/inventory/host_vars/sk-tomnext.yml @@ -41,8 +41,8 @@ cryptdisk_volumes: zfs_arc_size: - min: "{{ 2 * 1024 * 1024 * 1024 }}" - max: "{{ 8 * 1024 * 1024 * 1024 }}" + min: 2GB + max: 8GB zfs_pools: storage: diff --git a/roles/zfs/base/defaults/main.yml b/roles/zfs/base/defaults/main.yml index 55dabc59..dcef7628 100644 --- a/roles/zfs/base/defaults/main.yml +++ b/roles/zfs/base/defaults/main.yml @@ -1,8 +1,8 @@ --- zfs_use_systemd_mount_generator: yes #zfs_arc_size: -# min: {{ 2 * 1024 * 1024 * 1024 }} -# max: {{ 8 * 1024 * 1024 * 1024 }} +# min: 2GB +# max: 8GB zfs_pool_properties: ashift: 12 diff --git a/roles/zfs/base/tasks/main.yml b/roles/zfs/base/tasks/main.yml index e3783ad5..732c3346 100644 --- a/roles/zfs/base/tasks/main.yml +++ b/roles/zfs/base/tasks/main.yml @@ -3,8 +3,8 @@ 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 }} + options zfs zfs_arc_min={{ zfs_arc_size.min | human_to_bytes }} + options zfs zfs_arc_max={{ zfs_arc_size.max | human_to_bytes }} dest: /etc/modprobe.d/zfs.conf - name: install zfs modules |