This commit is contained in:
Daniel Akulenok
2026-03-03 12:02:02 +01:00
parent 6bdde637e4
commit bc0f5c5669
4 changed files with 10 additions and 22 deletions

View File

@@ -0,0 +1 @@
/home/dak/Code/ansible-podman

View File

@@ -166,9 +166,7 @@ podman_policy_trusted_registries:
podman_enable_auto_update: false podman_enable_auto_update: false
# Determine if Quadlet should be used (Debian 13+ or other distros) # Determine if Quadlet should be used (Debian 13+ or other distros)
podman_use_quadlet: "{{ podman_use_quadlet: "{{ not (ansible_distribution | default('Debian') == 'Debian' and ansible_distribution_major_version | int < 13) }}"
not (ansible_distribution | default('Debian') == 'Debian'
and ansible_distribution_major_version | int < 13) }}"
podman_mode: "{{ 'quadlet' if podman_use_quadlet else 'started' }}" podman_mode: "{{ 'quadlet' if podman_use_quadlet else 'started' }}"

View File

@@ -16,11 +16,8 @@
name: "{{ item }}-network" name: "{{ item }}-network"
state: restarted state: restarted
listen: Reload systemd listen: Reload systemd
loop: "{{ loop: "{{ (podman_networks | map(attribute='name') | list) if (podman_use_quadlet | bool) else (podman_network_output.results | selectattr('changed', 'equalto',
(podman_networks | map(attribute='name') | list) true) | map(attribute='item.name') | list) }}"
if (podman_use_quadlet | bool)
else (podman_network_output.results | selectattr('changed', 'equalto', true) | map(attribute='item.name') | list)
}}"
loop_control: loop_control:
label: "{{ item }}" label: "{{ item }}"
when: when:
@@ -33,11 +30,8 @@
name: "{{ item }}-volume" name: "{{ item }}-volume"
state: restarted state: restarted
listen: Reload systemd listen: Reload systemd
loop: "{{ loop: "{{ (podman_volumes | map(attribute='name') | list) if (podman_use_quadlet | bool) else (podman_volume_output.results | selectattr('changed', 'equalto', true)
(podman_volumes | map(attribute='name') | list) | map(attribute='item.name') | list) }}"
if (podman_use_quadlet | bool)
else (podman_volume_output.results | selectattr('changed', 'equalto', true) | map(attribute='item.name') | list)
}}"
loop_control: loop_control:
label: "{{ item }}" label: "{{ item }}"
when: when:
@@ -52,11 +46,8 @@
~ item ~ ('-pod' if not podman_generate_systemd | bool else '') }} ~ item ~ ('-pod' if not podman_generate_systemd | bool else '') }}
state: restarted state: restarted
listen: Reload systemd listen: Reload systemd
loop: "{{ loop: "{{ (podman_pods | map(attribute='name') | list) if (podman_use_quadlet | bool) else (podman_pod_output.results | selectattr('changed', 'equalto', true) |
(podman_pods | map(attribute='name') | list) map(attribute='item.name') | list) }}"
if (podman_use_quadlet | bool)
else (podman_pod_output.results | selectattr('changed', 'equalto', true) | map(attribute='item.name') | list)
}}"
loop_control: loop_control:
label: "{{ item }}" label: "{{ item }}"
when: when:

View File

@@ -2,8 +2,7 @@
# Generate systemd service files for Podman containers and pods # Generate systemd service files for Podman containers and pods
- name: Generate systemd service files for containers - name: Generate systemd service files for containers
vars: vars:
systemd_opts: "{{ item.systemd if item.systemd is defined systemd_opts: "{{ item.systemd if item.systemd is defined else (item.generate_systemd if item.generate_systemd is defined else {}) }}"
else (item.generate_systemd if item.generate_systemd is defined else {}) }}"
containers.podman.podman_generate_systemd: containers.podman.podman_generate_systemd:
name: "{{ item.name }}" name: "{{ item.name }}"
dest: "{{ podman_systemd_dir }}" dest: "{{ podman_systemd_dir }}"
@@ -28,8 +27,7 @@
- name: Generate systemd service files for pods - name: Generate systemd service files for pods
vars: vars:
systemd_opts: "{{ item.systemd if item.systemd is defined systemd_opts: "{{ item.systemd if item.systemd is defined else (item.generate_systemd if item.generate_systemd is defined else {}) }}"
else (item.generate_systemd if item.generate_systemd is defined else {}) }}"
containers.podman.podman_generate_systemd: containers.podman.podman_generate_systemd:
name: "{{ item.name }}" name: "{{ item.name }}"
dest: "{{ podman_systemd_dir }}" dest: "{{ podman_systemd_dir }}"