From 5640c3e76b93e6f62d195547a066dd37bef30f60 Mon Sep 17 00:00:00 2001
From: "Andreas B. Mundt" <andreas.mundt@steinbeisschule-reutlingen.de>
Date: Tue, 14 Mar 2023 17:12:53 +0100
Subject: [PATCH] Get ready for bookworm by default.

---
 lmn-desktop.yml               | 14 +++++++++++---
 roles/lmn_sssd/tasks/main.yml |  8 ++++++--
 roles/lmn_vm/tasks/main.yml   | 12 +++++++++---
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/lmn-desktop.yml b/lmn-desktop.yml
index a9ae690..37ae331 100644
--- a/lmn-desktop.yml
+++ b/lmn-desktop.yml
@@ -22,7 +22,7 @@
       - console-setup
       - krb5-user
       - unattended-upgrades
-    extra_pkgs_bpo: [ linux-image-amd64 ]
+    extra_pkgs_bpo: [] # [ linux-image-amd64 ]
     ansible_python_interpreter: "/usr/bin/python3"
 
   roles:
@@ -49,14 +49,22 @@
         replace: 'GRUB_CMDLINE_LINUX="i915.force_probe=4909"'
       notify: update grub
       when: ansible_board_vendor == "LENOVO" and ansible_board_name == "32CB"
-    - name: add bookworm
+
+    - name: add bookworm firmware repository if needed
       apt_repository:
         repo: deb http://deb.debian.org/debian/ bookworm non-free-firmware
         state: present
         update_cache: true
-      when: ansible_board_vendor == "LENOVO" and ansible_board_name == "32CB"
+      when: >
+        ansible_board_vendor == "LENOVO" and
+        ansible_board_name == "32CB" and
+        ansible_distribution_release == "bullseye"
     - name: upgrade non-free-firmware packages
       apt:
         upgrade: true
         autoremove: true
         autoclean: true
+      when: >
+        ansible_board_vendor == "LENOVO" and
+        ansible_board_name == "32CB" and
+        ansible_distribution_release == "bullseye"
diff --git a/roles/lmn_sssd/tasks/main.yml b/roles/lmn_sssd/tasks/main.yml
index 04b4f7f..082af5c 100644
--- a/roles/lmn_sssd/tasks/main.yml
+++ b/roles/lmn_sssd/tasks/main.yml
@@ -17,5 +17,9 @@
   ## Either one of the variables is defined:
 - name: join the domain
   shell:
-    cmd: echo "{{ ansible_cmdline.adpw | default('') + adpw.user_input | default('') }}" | adcli join --stdin-password -U global-admin {{ domain | upper }}
-  when: ansible_cmdline.adpw | default('') | length > 0 or adpw.user_input | default('') | length > 0
+    cmd: >
+      echo "{{ ansible_cmdline.adpw | default('') + adpw.user_input | default('') }}" |
+      adcli join --stdin-password -U global-admin {{ domain | upper }}
+  when: >
+    ansible_cmdline.adpw | default('') | length > 0 or
+    adpw.user_input | default('') | length > 0
diff --git a/roles/lmn_vm/tasks/main.yml b/roles/lmn_vm/tasks/main.yml
index 2adf629..d013156 100644
--- a/roles/lmn_vm/tasks/main.yml
+++ b/roles/lmn_vm/tasks/main.yml
@@ -103,12 +103,18 @@
     force: false
 
 - name: rsync VM image definitions
-  command: rsync -a --itemize-changes rsync://server:/vmimages-download/xml /var/lib/libvirt/images/
+  command: >
+    rsync -a --itemize-changes
+    rsync://server:/vmimages-download/xml /var/lib/libvirt/images/
   register: result
   changed_when: result.stdout | length > 0
 
 - name: rsync VM images
-  command: rsync -a -i --files-from=/var/lib/libvirt/images/images.list rsync://server:/vmimages-download/ /var/lib/libvirt/images/
+  command: >
+    rsync -a -i --files-from=/var/lib/libvirt/images/images.list
+    rsync://server:/vmimages-download/ /var/lib/libvirt/images/
   register: result
   changed_when: result.stdout | length > 0
-  when: not run_in_installer | default(false) | bool and (ansible_mounts | selectattr("mount", "equalto", "/") | list)[0].size_available > 80000000000
+  when: >
+    not run_in_installer | default(false) | bool and (ansible_mounts |
+    selectattr("mount", "equalto", "/") | list)[0].size_available > 80000000000