From 65dcedbe6cd88a6295b8f77271e34316e7e18cb8 Mon Sep 17 00:00:00 2001
From: Daniel Akulenok <dak@keepit.com>
Date: Wed, 17 Sep 2025 14:45:49 +0200
Subject: [PATCH] add

---
 .ansible/.lock       |  0
 defaults/main.yml    |  3 ++-
 tasks/containers.yml | 16 +---------------
 tasks/systemd.yml    |  4 ++--
 4 files changed, 5 insertions(+), 18 deletions(-)
 delete mode 100644 .ansible/.lock

diff --git a/.ansible/.lock b/.ansible/.lock
deleted file mode 100644
index e69de29..0000000
diff --git a/defaults/main.yml b/defaults/main.yml
index 8c5af08..1123fc0 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -617,12 +617,13 @@ podman_pods: []
 #       requires:
 #         - "postgresql.service"
 
+podman_auto_remove: true
 # Systemd service generation configuration
 podman_generate_systemd: true
 podman_systemd_dir: /etc/systemd/system
 podman_systemd_options:
   new: true
-  force: true
+  force: false
   restart_policy: always
   stop_timeout: 120
   no_header: false
diff --git a/tasks/containers.yml b/tasks/containers.yml
index 09d12f7..88e5f2f 100644
--- a/tasks/containers.yml
+++ b/tasks/containers.yml
@@ -18,7 +18,7 @@
     detach: "{{ item.detach | bool | default(omit) }}"
     interactive: "{{ item.interactive | bool | default(omit) }}"
     tty: "{{ item.tty | bool | default(omit) }}"
-    rm: "{{ item.auto_remove | bool | default(omit) }}"
+    rm: "{{ item.auto_remove | bool | default(podman_auto_remove) }}"
     rmi: "{{ item.remove_image | bool | default(omit) }}"
     privileged: "{{ item.privileged | bool | default(omit) }}"
     read_only: "{{ item.read_only | bool | default(omit) }}"
@@ -225,17 +225,3 @@
   loop_control:
     label: "{{ item.name }}"
   register: podman_container_results
-
-- name: Enable and start container systemd services
-  ansible.builtin.systemd:
-    name: "container-{{ item.item.name }}"
-    enabled: true
-    state: started
-    daemon_reload: true
-  loop: "{{ podman_container_results.results }}"
-  loop_control:
-    label: "{{ item.item.name }}"
-  when:
-    - item.item.generate_systemd is defined
-    - item.item.generate_systemd
-    - item.item.state | default('present') in ['present', 'started']
diff --git a/tasks/systemd.yml b/tasks/systemd.yml
index dd08695..7feae91 100644
--- a/tasks/systemd.yml
+++ b/tasks/systemd.yml
@@ -21,7 +21,7 @@
   loop: "{{ podman_containers }}"
   loop_control:
     label: "{{ item.name }}"
-  when: 
+  when:
     - podman_generate_systemd | bool
     - podman_containers is defined
     - podman_containers | length > 0
@@ -48,7 +48,7 @@
   loop: "{{ podman_pods }}"
   loop_control:
     label: "{{ item.name }}"
-  when: 
+  when:
     - podman_generate_systemd | bool
     - podman_pods is defined
     - podman_pods | length > 0