From bc0f5c56696983bdf6be1b8b30b29f025a1eeb2d Mon Sep 17 00:00:00 2001 From: Daniel Akulenok Date: Tue, 3 Mar 2026 12:02:02 +0100 Subject: [PATCH] Fix --- .ansible/roles/keepit.podman | 1 + defaults/main.yml | 4 +--- handlers/main.yml | 21 ++++++--------------- tasks/systemd.yml | 6 ++---- 4 files changed, 10 insertions(+), 22 deletions(-) create mode 120000 .ansible/roles/keepit.podman diff --git a/.ansible/roles/keepit.podman b/.ansible/roles/keepit.podman new file mode 120000 index 0000000..098884f --- /dev/null +++ b/.ansible/roles/keepit.podman @@ -0,0 +1 @@ +/home/dak/Code/ansible-podman \ No newline at end of file diff --git a/defaults/main.yml b/defaults/main.yml index 63d72f9..e59153c 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -166,9 +166,7 @@ podman_policy_trusted_registries: podman_enable_auto_update: false # Determine if Quadlet should be used (Debian 13+ or other distros) -podman_use_quadlet: "{{ - not (ansible_distribution | default('Debian') == 'Debian' - and ansible_distribution_major_version | int < 13) }}" +podman_use_quadlet: "{{ not (ansible_distribution | default('Debian') == 'Debian' and ansible_distribution_major_version | int < 13) }}" podman_mode: "{{ 'quadlet' if podman_use_quadlet else 'started' }}" diff --git a/handlers/main.yml b/handlers/main.yml index a9bfbf1..e0e8bc4 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -16,11 +16,8 @@ name: "{{ item }}-network" state: restarted listen: Reload systemd - loop: "{{ - (podman_networks | map(attribute='name') | list) - if (podman_use_quadlet | bool) - else (podman_network_output.results | selectattr('changed', 'equalto', true) | map(attribute='item.name') | list) - }}" + loop: "{{ (podman_networks | map(attribute='name') | list) if (podman_use_quadlet | bool) else (podman_network_output.results | selectattr('changed', 'equalto', + true) | map(attribute='item.name') | list) }}" loop_control: label: "{{ item }}" when: @@ -33,11 +30,8 @@ name: "{{ item }}-volume" state: restarted listen: Reload systemd - loop: "{{ - (podman_volumes | map(attribute='name') | list) - if (podman_use_quadlet | bool) - else (podman_volume_output.results | selectattr('changed', 'equalto', true) | map(attribute='item.name') | list) - }}" + loop: "{{ (podman_volumes | map(attribute='name') | list) if (podman_use_quadlet | bool) else (podman_volume_output.results | selectattr('changed', 'equalto', true) + | map(attribute='item.name') | list) }}" loop_control: label: "{{ item }}" when: @@ -52,11 +46,8 @@ ~ item ~ ('-pod' if not podman_generate_systemd | bool else '') }} state: restarted listen: Reload systemd - loop: "{{ - (podman_pods | map(attribute='name') | list) - if (podman_use_quadlet | bool) - else (podman_pod_output.results | selectattr('changed', 'equalto', true) | map(attribute='item.name') | list) - }}" + loop: "{{ (podman_pods | map(attribute='name') | list) if (podman_use_quadlet | bool) else (podman_pod_output.results | selectattr('changed', 'equalto', true) | + map(attribute='item.name') | list) }}" loop_control: label: "{{ item }}" when: diff --git a/tasks/systemd.yml b/tasks/systemd.yml index 9b6a634..56b7379 100644 --- a/tasks/systemd.yml +++ b/tasks/systemd.yml @@ -2,8 +2,7 @@ # Generate systemd service files for Podman containers and pods - 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 }}" @@ -28,8 +27,7 @@ - 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 }}"