From 2aa163babf7f94169cd66cfb93e68ef1e1abc10a Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Sun, 14 Apr 2024 21:31:08 +0200 Subject: [PATCH] ff --- group_vars/pve.yml | 7 ++++++- host_vars/pve5-test.mgrote.net.yml | 7 ------- host_vars/pve5.mgrote.net.yml | 7 ------- roles/mgrote_cv4pve_autosnap/defaults/main.yml | 2 +- roles/mgrote_cv4pve_autosnap/tasks/main.yml | 2 -- roles/mgrote_cv4pve_autosnap/tasks/user.yml | 1 + 6 files changed, 8 insertions(+), 18 deletions(-) diff --git a/group_vars/pve.yml b/group_vars/pve.yml index 63d8ca55..fbf1917f 100644 --- a/group_vars/pve.yml +++ b/group_vars/pve.yml @@ -28,7 +28,12 @@ users: allow_sudo: true allow_passwordless_sudo: true -### cv4pve + +### mgrote_cv4pve_autosnap +cv4pve_api_user: root@pam!cv4pve-autosnap +cv4pve_api_token: "{{ lookup('keepass', 'cv4pve_api_token', 'password') }}" +cv4pve_vmid: all,-115 +cv4pve_keep_snapshots: 5 cv4pve_version: "v1.14.8" ### mgrote_apt_manage_packages diff --git a/host_vars/pve5-test.mgrote.net.yml b/host_vars/pve5-test.mgrote.net.yml index fa97a4c2..41f8eeec 100644 --- a/host_vars/pve5-test.mgrote.net.yml +++ b/host_vars/pve5-test.mgrote.net.yml @@ -153,13 +153,6 @@ sanoid_datasets: snapshots: true template: '3tage' -### mgrote_cv4pve-autosnap -cv4pve_api_user: root@pam!cv4pve-autosnap -cv4pve_api_token: "{{ lookup('keepass', 'cv4pve_api_token', 'password') }}" -cv4pve_vmid: all -cv4pve_keep_snapshots: 5 -cv4pve_dl_link: "https://github.com/Corsinvest/cv4pve-autosnap/releases/download/v1.10.0/cv4pve-autosnap-linux-x64.zip" - ### mgrote_proxmox_bind_mounts pve_bind_mounts: - vmid: 100 diff --git a/host_vars/pve5.mgrote.net.yml b/host_vars/pve5.mgrote.net.yml index 6c0618bc..c51eacec 100644 --- a/host_vars/pve5.mgrote.net.yml +++ b/host_vars/pve5.mgrote.net.yml @@ -170,13 +170,6 @@ sanoid_datasets: snapshots: true template: 'pve3tage' -### mgrote_cv4pve-autosnap -cv4pve_api_user: root@pam!cv4pve-autosnap -cv4pve_api_token: "{{ lookup('keepass', 'cv4pve_api_token', 'password') }}" -cv4pve_vmid: all,-115 -cv4pve_keep_snapshots: 5 -cv4pve_dl_link: "https://github.com/Corsinvest/cv4pve-autosnap/releases/download/v1.14.7/cv4pve-autosnap-linux-x64.zip" - ### mgrote_proxmox_bind_mounts pve_bind_mounts: ### fileserver3 diff --git a/roles/mgrote_cv4pve_autosnap/defaults/main.yml b/roles/mgrote_cv4pve_autosnap/defaults/main.yml index 94d480ef..ce07c5d1 100644 --- a/roles/mgrote_cv4pve_autosnap/defaults/main.yml +++ b/roles/mgrote_cv4pve_autosnap/defaults/main.yml @@ -3,7 +3,7 @@ cv4pve_cron_minute: "39" cv4pve_cron_hour: "5" # proxmox api-token and user -cv4pve_api_token: "XXXXXXXXXXXXXXXXXXXXXX" +cv4pve_api_token: "supersecret" cv4pve_api_user: "root@pam!test2" # which vm to snapshot cv4pve_vmid: all diff --git a/roles/mgrote_cv4pve_autosnap/tasks/main.yml b/roles/mgrote_cv4pve_autosnap/tasks/main.yml index c584cf20..047aae01 100644 --- a/roles/mgrote_cv4pve_autosnap/tasks/main.yml +++ b/roles/mgrote_cv4pve_autosnap/tasks/main.yml @@ -10,6 +10,4 @@ ... -# permissions #linter -# varioablen diff --git a/roles/mgrote_cv4pve_autosnap/tasks/user.yml b/roles/mgrote_cv4pve_autosnap/tasks/user.yml index 7ceab35b..505dfbbd 100644 --- a/roles/mgrote_cv4pve_autosnap/tasks/user.yml +++ b/roles/mgrote_cv4pve_autosnap/tasks/user.yml @@ -17,3 +17,4 @@ when: - cv4pve_user_group is defined - cv4pve_user is defined +...