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 db6aa9c..9146c30 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -168,7 +168,10 @@ podman_enable_api_service: false 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 | default('13') | 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' }}" # Container management diff --git a/handlers/main.yml b/handlers/main.yml index 7595888..f22febe 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -16,7 +16,8 @@ name: "{{ item }}-network" state: restarted listen: Reload systemd - loop: "{{ podman_network_output.results | selectattr('changed', 'equalto', true) | map(attribute='item.name') | list }}" + loop: | + {{ podman_network_output.results | selectattr('changed', 'equalto', true) | map(attribute='item.name') | list }} loop_control: label: "{{ item }}" when: @@ -29,7 +30,8 @@ name: "{{ item }}-volume" state: restarted listen: Reload systemd - loop: "{{ podman_volume_output.results | selectattr('changed', 'equalto', true) | map(attribute='item.name') | list }}" + loop: | + {{ podman_volume_output.results | selectattr('changed', 'equalto', true) | map(attribute='item.name') | list }} loop_control: label: "{{ item }}" when: @@ -39,10 +41,13 @@ - name: Restart Podman pods ansible.builtin.systemd: - name: "{{ (podman_systemd_options.pod_prefix if podman_generate_systemd | bool else '') ~ item ~ ('-pod' if not podman_generate_systemd | bool else '') }}" + name: | + {{ (podman_systemd_options.pod_prefix if podman_generate_systemd | bool else '') + ~ item ~ ('-pod' if not podman_generate_systemd | bool else '') }} state: restarted listen: Reload systemd - loop: "{{ podman_pod_output.results | selectattr('changed', 'equalto', true) | map(attribute='item.name') | list }}" + loop: | + {{ podman_pod_output.results | selectattr('changed', 'equalto', true) | map(attribute='item.name') | list }} loop_control: label: "{{ item }}" when: @@ -51,10 +56,12 @@ - name: Restart Podman containers ansible.builtin.systemd: - name: "{{ (podman_systemd_options.container_prefix if podman_generate_systemd | bool else '') ~ item }}" + name: | + {{ (podman_systemd_options.container_prefix if podman_generate_systemd | bool else '') ~ item }} state: restarted listen: Reload systemd - loop: "{{ podman_container_output.results | selectattr('changed', 'equalto', true) | map(attribute='item.name') | list }}" + loop: | + {{ podman_container_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 7feae91..c8870df 100644 --- a/tasks/systemd.yml +++ b/tasks/systemd.yml @@ -3,7 +3,8 @@ - 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 }}" @@ -30,7 +31,8 @@ - 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 }}"