diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2021-06-07 20:03:21 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2021-06-07 20:03:21 +0200 |
| commit | 18c5e665b0c50a91f942e3adcc71acf5c7e0e4af (patch) | |
| tree | b62cd9d995e3e505b2253444ce3c20d07ae86988 /roles/storage/zfs | |
| parent | docker: auto-select package name base on pkg provider (diff) | |
zfs: minor cleanup
Diffstat (limited to 'roles/storage/zfs')
| -rw-r--r-- | roles/storage/zfs/pools/defaults/main.yml | 4 | ||||
| -rw-r--r-- | roles/storage/zfs/pools/tasks/main.yml | 2 | ||||
| -rw-r--r-- | roles/storage/zfs/volume/defaults/main.yml | 4 | ||||
| -rw-r--r-- | roles/storage/zfs/volume/tasks/main.yml | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/roles/storage/zfs/pools/defaults/main.yml b/roles/storage/zfs/pools/defaults/main.yml index dcef7628..1566890d 100644 --- a/roles/storage/zfs/pools/defaults/main.yml +++ b/roles/storage/zfs/pools/defaults/main.yml @@ -1,10 +1,10 @@ --- zfs_use_systemd_mount_generator: yes #zfs_arc_size: -# min: 2GB +# min: 512MB # max: 8GB -zfs_pool_properties: +zfs_pool_default_properties: ashift: 12 # zfs_pools: diff --git a/roles/storage/zfs/pools/tasks/main.yml b/roles/storage/zfs/pools/tasks/main.yml index 1a6b911d..99b8e228 100644 --- a/roles/storage/zfs/pools/tasks/main.yml +++ b/roles/storage/zfs/pools/tasks/main.yml @@ -58,4 +58,4 @@ loop_control: label: "{{ item.key }}" when: item.key not in zfs_existing_pools - command: "zpool create -m {{ item.value.mountpoint }} {% for prop, value in (item.value.properties | default(zfs_pool_properties)).items() %}-o {{ prop }}={{ value }} {% endfor %}{{ item.key }} {{ item.value.create_vdevs }}" + command: "zpool create -m {{ item.value.mountpoint }} {% for prop, value in (item.value.properties | default(zfs_pool_default_properties)).items() %}-o {{ prop }}={{ value }} {% endfor %}{{ item.key }} {{ item.value.create_vdevs }}" diff --git a/roles/storage/zfs/volume/defaults/main.yml b/roles/storage/zfs/volume/defaults/main.yml index 37733d42..e438f28c 100644 --- a/roles/storage/zfs/volume/defaults/main.yml +++ b/roles/storage/zfs/volume/defaults/main.yml @@ -1,8 +1,8 @@ --- # zfs_volume: # dest: /srv/foo/bar -# pool: foo -# name: bar +# pool: tank +# name: foo/bar # properties: # quota: 10G diff --git a/roles/storage/zfs/volume/tasks/main.yml b/roles/storage/zfs/volume/tasks/main.yml index f13f6950..834bfd18 100644 --- a/roles/storage/zfs/volume/tasks/main.yml +++ b/roles/storage/zfs/volume/tasks/main.yml @@ -2,8 +2,8 @@ - name: create zfs dataset zfs: name: "{{ zfs_volume.pool }}/{{ zfs_volume.name }}" - state: present extra_zfs_properties: "{{ zfs_volume.properties | default(omit) }}" + state: present - name: bind mount filesystem vars: |