From 1fb1c85b5d093c35b0c2d766eed73354731fd897 Mon Sep 17 00:00:00 2001
From: Daniel Akulenok <dak@keepit.com>
Date: Fri, 12 Sep 2025 12:44:58 +0200
Subject: [PATCH] podman

---
 defaults/main.yml             |  5 -----
 molecule/default/molecule.yml |  2 +-
 molecule/default/prepare.yml  |  2 +-
 tasks/containers.yml          |  2 +-
 tasks/systemd.yml             | 12 ++++++++----
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 8c5af08..d1b24da 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -5,11 +5,6 @@
 podman_packages:
   - podman
   - crun
-  - buildah
-  - skopeo
-  - fuse-overlayfs
-  - slirp4netns
-  - uidmap
 
 # Podman configuration
 podman_configure_registries: true
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index b319cd8..9efaac2 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -14,7 +14,7 @@ platforms:
   - name: debian-bullseye
     image: docker.io/jrei/systemd-debian:12
     <<: *platform_defaults
-  - name: debian-bullseye
+  - name: debian-trixie
     image: docker.io/jrei/systemd-debian:13
     <<: *platform_defaults
 
diff --git a/molecule/default/prepare.yml b/molecule/default/prepare.yml
index febac6e..af9388d 100644
--- a/molecule/default/prepare.yml
+++ b/molecule/default/prepare.yml
@@ -5,7 +5,7 @@
   tasks:
     - name: Ensure apt cache is up-to-date
       ansible.builtin.apt:
-        update_cache: yes
+        update_cache: true
         cache_valid_time: 3600
 
     - name: Install prerequisites used by the role/tests
diff --git a/tasks/containers.yml b/tasks/containers.yml
index 60c90d5..fa220a3 100644
--- a/tasks/containers.yml
+++ b/tasks/containers.yml
@@ -224,4 +224,4 @@
   loop: "{{ podman_containers }}"
   loop_control:
     label: "{{ item.name }}"
-  register: podman_container_results
\ No newline at end of file
+  register: podman_container_results
diff --git a/tasks/systemd.yml b/tasks/systemd.yml
index dd08695..4288ea2 100644
--- a/tasks/systemd.yml
+++ b/tasks/systemd.yml
@@ -3,7 +3,9 @@
 
 - name: Generate systemd service files for containers
   vars:
-    systemd_opts: "{{ item.systemd if item.systemd is defined else (item.generate_systemd if item.generate_systemd is defined else {}) }}"
+    systemd_opts: "{{
+      item.systemd if item.systemd is defined
+      else (item.generate_systemd if item.generate_systemd is defined else {}) }}"
   containers.podman.podman_generate_systemd:
     name: "{{ item.name }}"
     dest: "{{ podman_systemd_dir }}"
@@ -21,7 +23,7 @@
   loop: "{{ podman_containers }}"
   loop_control:
     label: "{{ item.name }}"
-  when: 
+  when:
     - podman_generate_systemd | bool
     - podman_containers is defined
     - podman_containers | length > 0
@@ -30,7 +32,9 @@
 
 - name: Generate systemd service files for pods
   vars:
-    systemd_opts: "{{ item.systemd if item.systemd is defined else (item.generate_systemd if item.generate_systemd is defined else {}) }}"
+    systemd_opts: "{{
+      item.systemd if item.systemd is defined
+      else (item.generate_systemd if item.generate_systemd is defined else {}) }}"
   containers.podman.podman_generate_systemd:
     name: "{{ item.name }}"
     dest: "{{ podman_systemd_dir }}"
@@ -48,7 +52,7 @@
   loop: "{{ podman_pods }}"
   loop_control:
     label: "{{ item.name }}"
-  when: 
+  when:
     - podman_generate_systemd | bool
     - podman_pods is defined
     - podman_pods | length > 0