From c0ef189607db0961a5f60b87e97e485e156872fe Mon Sep 17 00:00:00 2001 From: mg Date: Sat, 13 Mar 2021 22:11:10 +0100 Subject: [PATCH] zfs_trim entfernt (#38) zfs_trim entfernt Co-authored-by: Michael Grote Reviewed-on: https://git.mgrote.net/mg/ansible/pulls/38 Co-Authored-By: mg Co-Committed-By: mg --- host_vars/pve2-test.grote.lan.yml | 2 -- host_vars/pve2.grote.lan.yml | 2 -- host_vars/pve3-test.grote.lan.yml | 1 - host_vars/pve3.grote.lan.yml | 1 - host_vars/pve4-test.grote.lan.yml | 1 - host_vars/pve4.grote.lan.yml | 1 - playbooks/service/proxmox.yml | 1 - roles/mgrote.zfs_trim/README.md | 12 ------------ roles/mgrote.zfs_trim/defaults/main.yml | 2 -- roles/mgrote.zfs_trim/meta/main.yml | 3 --- roles/mgrote.zfs_trim/tasks/main.yml | 14 -------------- 11 files changed, 40 deletions(-) delete mode 100644 roles/mgrote.zfs_trim/README.md delete mode 100644 roles/mgrote.zfs_trim/defaults/main.yml delete mode 100644 roles/mgrote.zfs_trim/meta/main.yml delete mode 100644 roles/mgrote.zfs_trim/tasks/main.yml diff --git a/host_vars/pve2-test.grote.lan.yml b/host_vars/pve2-test.grote.lan.yml index abca0977..78fea122 100644 --- a/host_vars/pve2-test.grote.lan.yml +++ b/host_vars/pve2-test.grote.lan.yml @@ -50,7 +50,6 @@ zfs_extra_arc_max_size: "2147483648" # 2GB in Bytes zfs_extra_zfs_pools: - name: "rpool" - type: "ssd" cron_minute_zfs_trim: "5" cron_hour_zfs_trim: "22" cron_month_zfs_trim: "4,8,12" @@ -59,7 +58,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" diff --git a/host_vars/pve2.grote.lan.yml b/host_vars/pve2.grote.lan.yml index 10e151b8..84bd1e24 100644 --- a/host_vars/pve2.grote.lan.yml +++ b/host_vars/pve2.grote.lan.yml @@ -48,7 +48,6 @@ zfs_extra_max_usage_health: "75" zfs_extra_zfs_pools: - name: "rpool" - type: "ssd" cron_minute_zfs_trim: "5" cron_hour_zfs_trim: "22" cron_month_zfs_trim: "4,8,12" @@ -57,7 +56,6 @@ cron_minutes_zfs_scrub: "0" cron_hour_zfs_scrub: "23" - name: "hdd_data_raidz" - type: "hdd" cron_minute_zfs_trim: "5" cron_hour_zfs_trim: "24" cron_month_zfs_trim: "4,8,12" diff --git a/host_vars/pve3-test.grote.lan.yml b/host_vars/pve3-test.grote.lan.yml index 2b58869c..69e0c9c8 100644 --- a/host_vars/pve3-test.grote.lan.yml +++ b/host_vars/pve3-test.grote.lan.yml @@ -38,7 +38,6 @@ zfs_extra_arc_max_size: "2147483648" # 2GB in Bytes zfs_extra_zfs_pools: - name: "rpool" - type: "ssd" cron_minute_zfs_trim: "5" cron_hour_zfs_trim: "22" cron_month_zfs_trim: "4,8,12" diff --git a/host_vars/pve3.grote.lan.yml b/host_vars/pve3.grote.lan.yml index 932c510b..eaf7d873 100644 --- a/host_vars/pve3.grote.lan.yml +++ b/host_vars/pve3.grote.lan.yml @@ -38,7 +38,6 @@ zfs_extra_arc_max_size: "6442450944" # 6GB in Bytes zfs_extra_zfs_pools: - name: "rpool" - type: "ssd" cron_minute_zfs_trim: "5" cron_hour_zfs_trim: "22" cron_month_zfs_trim: "4,8,12" diff --git a/host_vars/pve4-test.grote.lan.yml b/host_vars/pve4-test.grote.lan.yml index 2b58869c..69e0c9c8 100644 --- a/host_vars/pve4-test.grote.lan.yml +++ b/host_vars/pve4-test.grote.lan.yml @@ -38,7 +38,6 @@ zfs_extra_arc_max_size: "2147483648" # 2GB in Bytes zfs_extra_zfs_pools: - name: "rpool" - type: "ssd" cron_minute_zfs_trim: "5" cron_hour_zfs_trim: "22" cron_month_zfs_trim: "4,8,12" diff --git a/host_vars/pve4.grote.lan.yml b/host_vars/pve4.grote.lan.yml index 932c510b..eaf7d873 100644 --- a/host_vars/pve4.grote.lan.yml +++ b/host_vars/pve4.grote.lan.yml @@ -38,7 +38,6 @@ zfs_extra_arc_max_size: "6442450944" # 6GB in Bytes zfs_extra_zfs_pools: - name: "rpool" - type: "ssd" cron_minute_zfs_trim: "5" cron_hour_zfs_trim: "22" cron_month_zfs_trim: "4,8,12" diff --git a/playbooks/service/proxmox.yml b/playbooks/service/proxmox.yml index 36720b49..69d12031 100644 --- a/playbooks/service/proxmox.yml +++ b/playbooks/service/proxmox.yml @@ -5,7 +5,6 @@ - { role: mgrote.zfs_arc_mem, tags: "zfs_arc_mem" } - { role: mgrote.zfs_manage_datasets, tags: "datasets" } - { role: mgrote.zfs_scrub, tags: "zfs_scrub" } - - { role: mgrote.zfs_trim, tags: "zfs_trim" } - { role: mgrote.zfs_zed, tags: "zfs_zed" } - { role: mgrote.zfs_health, tags: "zfs_health" } - { role: mgrote.zfs_sanoid, diff --git a/roles/mgrote.zfs_trim/README.md b/roles/mgrote.zfs_trim/README.md deleted file mode 100644 index 281813d5..00000000 --- a/roles/mgrote.zfs_trim/README.md +++ /dev/null @@ -1,12 +0,0 @@ -## mgrote.zfs_trim - -### Beschreibung -Richtet regelmaessigen Trim(alle 4 Monate) ein. - - -### Funktioniert auf -- [x] ProxMox 6.1 - -### Variablen + Defaults -- see [defaults](./defaults/main.yml) -- Variablen für mgrote.zfs_health/trim/scrub/zed/arc_mem/ sind zusammengefasst unter zfs_extra_* diff --git a/roles/mgrote.zfs_trim/defaults/main.yml b/roles/mgrote.zfs_trim/defaults/main.yml deleted file mode 100644 index 31569546..00000000 --- a/roles/mgrote.zfs_trim/defaults/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -zfs_extra_path_zpool: "/usr/sbin/zpool" diff --git a/roles/mgrote.zfs_trim/meta/main.yml b/roles/mgrote.zfs_trim/meta/main.yml deleted file mode 100644 index 35df54ac..00000000 --- a/roles/mgrote.zfs_trim/meta/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -dependencies: - - role: mgrote.zfs_packages diff --git a/roles/mgrote.zfs_trim/tasks/main.yml b/roles/mgrote.zfs_trim/tasks/main.yml deleted file mode 100644 index c6ed622a..00000000 --- a/roles/mgrote.zfs_trim/tasks/main.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- - - name: add cronjob "zfs-trim" - become: yes - ansible.builtin.cron: - name: zfs-trim - "{{ item.name }}" - state: present - job: "{{ zfs_extra_path_zpool }} trim {{ item.name }}" - minute: "{{ item.cron_minute_zfs_trim }}" - hour: "{{ item.cron_hour_zfs_trim }}" - month: "{{ item.cron_month_zfs_trim }}" - day: "{{ item.cron_day_zfs_trim }}" -# disabled: yes - when: item.type == 'ssd' - with_items: "{{ zfs_extra_zfs_pools }}"