From e0ddd8e216ad772c4f65833ad1f92ba86ae74b8d Mon Sep 17 00:00:00 2001 From: mg Date: Wed, 5 Jul 2023 12:39:56 +0200 Subject: [PATCH] update to pve8 (#547) Co-authored-by: Michael Grote Reviewed-on: https://git.mgrote.net/mg/homeserver/pulls/547 --- group_vars/all.yml | 2 +- host_vars/pve5-test.grote.lan.yml | 2 +- roles/mgrote.apt_manage_sources/defaults/main.yml | 2 +- roles/mgrote.apt_manage_sources/tasks/pve.yml | 8 +++----- .../templates/pve-no-subscription.j2 | 1 + roles/mgrote.pbs_pve_integration/tasks/main.yml | 4 ---- roles/mgrote.zfs_sanoid/defaults/main.yml | 2 +- 7 files changed, 8 insertions(+), 13 deletions(-) create mode 100644 roles/mgrote.apt_manage_sources/templates/pve-no-subscription.j2 diff --git a/group_vars/all.yml b/group_vars/all.yml index e791f8bf..fd3b1c70 100644 --- a/group_vars/all.yml +++ b/group_vars/all.yml @@ -238,7 +238,7 @@ autoprune: 'yes' ### mgrote.zfs_sanoid - sanoid_deb_url: http://docker10.grote.lan:3344/sanoid_2.1.0.deb + sanoid_deb_url: http://docker10.grote.lan:3344/sanoid_3.0.0.deb # Ansible Variablen ### User diff --git a/host_vars/pve5-test.grote.lan.yml b/host_vars/pve5-test.grote.lan.yml index 030e2fcf..44e5aa23 100644 --- a/host_vars/pve5-test.grote.lan.yml +++ b/host_vars/pve5-test.grote.lan.yml @@ -229,4 +229,4 @@ datastore: zfs_backup username: user_pve5-test@pbs password: "{{ lookup('keepass', 'pbs_pve_user-test', 'password') }}" - fingerprint: "7F:AC:54:75:1C:33:55:84:1E:1E:3A:15:5A:5E:AF:79:33:C9:D4:E1:C0:A0:1C:0D:9E:6A:EA:82:F9:27:57:79" + fingerprint: "38:53:f6:1e:99:99:76:78:c4:00:dd:90:1a:89:47:56:97:4e:f3:62:01:d2:2c:76:ba:f8:55:be:f8:05:d1:7a" diff --git a/roles/mgrote.apt_manage_sources/defaults/main.yml b/roles/mgrote.apt_manage_sources/defaults/main.yml index e6f10978..30e6d5d8 100644 --- a/roles/mgrote.apt_manage_sources/defaults/main.yml +++ b/roles/mgrote.apt_manage_sources/defaults/main.yml @@ -3,7 +3,7 @@ manage_sources_proxmox_enterprise_repo_path: /etc/apt/sources.list.d/pve-enterprise.list # wo ist das enterprise-repo manage_sources_proxmox_apt_repo_key_url: http://download.proxmox.com/debian/proxmox-ve-release-6.x.gpg # url zum key für no-subscription-repo manage_sources_proxmox_apt_repo_key_path: /etc/apt/trusted.gpg.d/proxmox-ve-release-6.x.gpg # pfad lokal zum key für no-subscription-repo - manage_sources_proxmox_apt_repo_no_subscription: deb http://download.proxmox.com/debian/pve bullseye pve-no-subscription # url zum für no-subscription-repo, manage_sources_apt_proxy_url wird aus der variable entnommen + manage_sources_proxmox_apt_repo_no_subscription: deb http://download.proxmox.com/debian/pve bookworm pve-no-subscription # url zum für no-subscription-repo, manage_sources_apt_proxy_url wird aus der variable entnommen manage_sources_apt_proxy: docker10.grote.lan:9999 # url+Port vom proxy diff --git a/roles/mgrote.apt_manage_sources/tasks/pve.yml b/roles/mgrote.apt_manage_sources/tasks/pve.yml index d14668c1..9f513feb 100644 --- a/roles/mgrote.apt_manage_sources/tasks/pve.yml +++ b/roles/mgrote.apt_manage_sources/tasks/pve.yml @@ -28,9 +28,7 @@ - name: add pve-no-subscription repo become: yes - ansible.builtin.apt_repository: - repo: "{{ manage_sources_proxmox_apt_repo_no_subscription }}" - state: present - filename: pve-no-subscription - update_cache: no + ansible.builtin.template: + src: pve-no-subscription.j2 + dest: pve-no-subscription.list notify: update package lists diff --git a/roles/mgrote.apt_manage_sources/templates/pve-no-subscription.j2 b/roles/mgrote.apt_manage_sources/templates/pve-no-subscription.j2 new file mode 100644 index 00000000..1f237f16 --- /dev/null +++ b/roles/mgrote.apt_manage_sources/templates/pve-no-subscription.j2 @@ -0,0 +1 @@ +{{ manage_sources_proxmox_apt_repo_no_subscription }} diff --git a/roles/mgrote.pbs_pve_integration/tasks/main.yml b/roles/mgrote.pbs_pve_integration/tasks/main.yml index 08ae7bd9..0425807e 100644 --- a/roles/mgrote.pbs_pve_integration/tasks/main.yml +++ b/roles/mgrote.pbs_pve_integration/tasks/main.yml @@ -17,7 +17,3 @@ loop: "{{ pve_pbs_datastore }}" when: "item.name in storages.stdout" changed_when: false - - - -# alle pbs variablen beschscireben und kennworter in keeprss diff --git a/roles/mgrote.zfs_sanoid/defaults/main.yml b/roles/mgrote.zfs_sanoid/defaults/main.yml index c0ad09cc..97bd8f52 100644 --- a/roles/mgrote.zfs_sanoid/defaults/main.yml +++ b/roles/mgrote.zfs_sanoid/defaults/main.yml @@ -4,7 +4,7 @@ ### when should syncoid be run sanoid_syncoid_timer: '*-*-* *:00:00' ### where to download the package - sanoid_deb_url: http://docker10.grote.lan:3344/sanoid_2.1.0.deb + sanoid_deb_url: http://docker10.grote.lan:3344/sanoid_3.0.0.deb # ### "Default" Datasets # sanoid_datasets: # dictionary