From cc749ca64eed5000d8329e829c1d383d5f7a8971 Mon Sep 17 00:00:00 2001 From: mg Date: Thu, 18 Feb 2021 08:36:43 +0100 Subject: [PATCH] Anpassungen Datasets --- host_vars/pve2-test.grote.lan.yml | 10 +++++++++- host_vars/pve2.grote.lan.yml | 24 ++++++++++-------------- host_vars/pve3-test.grote.lan.yml | 10 +++++++++- host_vars/pve3.grote.lan.yml | 10 +++++++++- host_vars/pve4-test.grote.lan.yml | 10 +++++++++- host_vars/pve4.grote.lan.yml | 10 +++++++++- 6 files changed, 55 insertions(+), 19 deletions(-) diff --git a/host_vars/pve2-test.grote.lan.yml b/host_vars/pve2-test.grote.lan.yml index 0c73fe30..957dd165 100644 --- a/host_vars/pve2-test.grote.lan.yml +++ b/host_vars/pve2-test.grote.lan.yml @@ -10,7 +10,15 @@ # zpool create -f -o ashift=12 hdd_vm_mirror mirror /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive-scsi2 /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive-scsi1 mirror /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive-scsi6 /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive-scsi5 # HDD_DATA_RAIDZ # zpool create -f -o ashift=12 hdd_data_raidz raidz /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive-scsi9 /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive-scsi3 /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive-scsi4 - zfs_datasets: + zfs_datasets: # DatenPools werden hier nicht verwaltet + - dataset: rpool/vm + state: present + compression: lz4 + sync: disabled + xattr: sa + dnodesize: auto + atime: on + snapdir: hidden - dataset: rpool/vm/dir state: present compression: lz4 diff --git a/host_vars/pve2.grote.lan.yml b/host_vars/pve2.grote.lan.yml index c1064c10..13022849 100644 --- a/host_vars/pve2.grote.lan.yml +++ b/host_vars/pve2.grote.lan.yml @@ -1,16 +1,21 @@ --- ### mgrote.zfs_manage_datasets - # "Daten"-Datasets verwalte ich händisch! # zfs create -o encryption=aes-256-gcm -o keyformat=passphrase hdd_data_raidz/data_crypt # zfs create hdd_data_raidz/videos # Pools müssen vorher erstellt sein! # rpool - # zpool create -f -o ashift=12 rpool mirror /dev/disk/by-id/ata-ADATA_SU650_2J4420001210 /dev/disk/by-id/ata-ADATA_SU650_2J4420001241 - # HDD_VM_MIRROR - # zpool create -f -o ashift=12 hdd_vm_mirror mirror /dev/disk/by-id/ata-WDC_WD20EACS-11BHUB0_WD-WCAZA3124223 /dev/disk/by-id/ata-WDC_WD20EZRX-00D8PB0_WD-WMC4M1682516 mirror /dev/disk/by-id/ata-WDC_WD30EZRX-00DC0B0_WD-WMC1T3979908 /dev/disk/by-id/ata-TOSHIBA_DT01ACA300_83M2DRAKS + # zpool create -f -o ashift=12 rpool mirror ata-SAMSUNG_MZ7LH960HAJR-00005_S45NNC0R105094 /dev/disk/by-id/ata-SAMSUNG_MZ7LH960HAJR-00005_S45NNC0R105095 # HDD_DATA_RAIDZ # zpool create -f -o ashift=12 hdd_data_raidz raidz /dev/disk/by-id/ata-WDC_WD80EZAZ-11TDBA0_2SG991TJ /dev/disk/by-id/ata-WDC_WD80EZAZ-11TDBA0_2SGA23EJ /dev/disk/by-id/ata-ST8000DM004-2CX188_ZCT1AK0F zfs_datasets: # DatenPools werden hier nicht verwaltet + - dataset: rpool/vm + state: present + compression: lz4 + sync: disabled + xattr: sa + dnodesize: auto + atime: on + snapdir: hidden - dataset: rpool/vm/dir state: present compression: lz4 @@ -42,7 +47,7 @@ zfs_extra_arc_max_size: "17179869184" # 16GB in Bytes zfs_extra_max_usage_health: "65" zfs_extra_zfs_pools: - - name: "ssd_vm_mirror" + - name: "rpool" type: "ssd" cron_minute_zfs_trim: "5" cron_hour_zfs_trim: "22" @@ -51,15 +56,6 @@ cron_weekday_zfs_scrub: "6" cron_minutes_zfs_scrub: "0" cron_hour_zfs_scrub: "23" - - name: "hdd_vm_mirror" - type: "hdd" - cron_minute_zfs_trim: "5" - cron_hour_zfs_trim: "23" - cron_month_zfs_trim: "4,8,12" - cron_day_zfs_trim: "2" - cron_weekday_zfs_scrub: "6" - cron_minutes_zfs_scrub: "0" - cron_hour_zfs_scrub: "22" - name: "hdd_data_raidz" type: "hdd" cron_minute_zfs_trim: "5" diff --git a/host_vars/pve3-test.grote.lan.yml b/host_vars/pve3-test.grote.lan.yml index 7cc5e581..0c9404cb 100644 --- a/host_vars/pve3-test.grote.lan.yml +++ b/host_vars/pve3-test.grote.lan.yml @@ -1,7 +1,15 @@ --- ### mgrote.zfs_manage_datasets # rpool wird von pve bei installation erstellt wenn die installation mit zfs durchgeführt wird - zfs_datasets: + zfs_datasets: # DatenPools werden hier nicht verwaltet + - dataset: rpool/vm + state: present + compression: lz4 + sync: disabled + xattr: sa + dnodesize: auto + atime: on + snapdir: hidden - dataset: rpool/vm/dir state: present compression: lz4 diff --git a/host_vars/pve3.grote.lan.yml b/host_vars/pve3.grote.lan.yml index 3b817516..a3dfaee9 100644 --- a/host_vars/pve3.grote.lan.yml +++ b/host_vars/pve3.grote.lan.yml @@ -1,7 +1,15 @@ --- ### mgrote.zfs_manage_datasets # rpool wird von pve bei installation erstellt wenn die installation mit zfs durchgeführt wird - zfs_datasets: + zfs_datasets: # DatenPools werden hier nicht verwaltet + - dataset: rpool/vm + state: present + compression: lz4 + sync: disabled + xattr: sa + dnodesize: auto + atime: on + snapdir: hidden - dataset: rpool/vm/dir state: present compression: lz4 diff --git a/host_vars/pve4-test.grote.lan.yml b/host_vars/pve4-test.grote.lan.yml index 7cc5e581..0c9404cb 100644 --- a/host_vars/pve4-test.grote.lan.yml +++ b/host_vars/pve4-test.grote.lan.yml @@ -1,7 +1,15 @@ --- ### mgrote.zfs_manage_datasets # rpool wird von pve bei installation erstellt wenn die installation mit zfs durchgeführt wird - zfs_datasets: + zfs_datasets: # DatenPools werden hier nicht verwaltet + - dataset: rpool/vm + state: present + compression: lz4 + sync: disabled + xattr: sa + dnodesize: auto + atime: on + snapdir: hidden - dataset: rpool/vm/dir state: present compression: lz4 diff --git a/host_vars/pve4.grote.lan.yml b/host_vars/pve4.grote.lan.yml index 3b817516..a3dfaee9 100644 --- a/host_vars/pve4.grote.lan.yml +++ b/host_vars/pve4.grote.lan.yml @@ -1,7 +1,15 @@ --- ### mgrote.zfs_manage_datasets # rpool wird von pve bei installation erstellt wenn die installation mit zfs durchgeführt wird - zfs_datasets: + zfs_datasets: # DatenPools werden hier nicht verwaltet + - dataset: rpool/vm + state: present + compression: lz4 + sync: disabled + xattr: sa + dnodesize: auto + atime: on + snapdir: hidden - dataset: rpool/vm/dir state: present compression: lz4