From f721641fc6e7f42f1c3ae8997ea8ce5334b1eef8 Mon Sep 17 00:00:00 2001 From: uumas Date: Thu, 12 Mar 2026 00:10:31 +0200 Subject: [PATCH] Use systemd handlers from uumas.general.systemd --- roles/container/handlers/main.yaml | 11 +++++------ roles/container/tasks/main.yaml | 4 +++- roles/network/handlers/main.yaml | 9 ++++----- roles/network/tasks/main.yaml | 4 +++- roles/podman/handlers/main.yaml | 4 ---- roles/podman/meta/main.yaml | 1 + roles/service/handlers/main.yaml | 9 ++++----- roles/service/tasks/native_socket.yaml | 4 +++- roles/volume/handlers/main.yaml | 9 ++++----- roles/volume/tasks/main.yaml | 4 +++- 10 files changed, 30 insertions(+), 29 deletions(-) delete mode 100644 roles/podman/handlers/main.yaml diff --git a/roles/container/handlers/main.yaml b/roles/container/handlers/main.yaml index 2d2cd5b..ac9fd53 100644 --- a/roles/container/handlers/main.yaml +++ b/roles/container/handlers/main.yaml @@ -1,7 +1,6 @@ --- -- name: "Restart container service {{ container_name }}" - ansible.builtin.systemd_service: - name: "{{ container_name }}.service" - state: restarted - daemon_reload: true - ignore_errors: '{{ ansible_check_mode }}' +- name: Restart container service {{ container_name }} + ansible.builtin.set_fact: + systemd_restart_units: "{{ systemd_restart_units + [container_name ~ '.service'] }}" # noqa: var-naming[no-role-prefix] + changed_when: true + notify: Apply systemd unit restarts diff --git a/roles/container/tasks/main.yaml b/roles/container/tasks/main.yaml index d882308..5a8c3d9 100644 --- a/roles/container/tasks/main.yaml +++ b/roles/container/tasks/main.yaml @@ -57,4 +57,6 @@ state: quadlet quadlet_file_mode: "0600" quadlet_options: "{{ _container_quadlet_options }}" - notify: Restart container service {{ container_name }} + notify: + - Reload systemd daemon + - Restart container service {{ container_name }} diff --git a/roles/network/handlers/main.yaml b/roles/network/handlers/main.yaml index ced8482..5dce3b4 100644 --- a/roles/network/handlers/main.yaml +++ b/roles/network/handlers/main.yaml @@ -1,7 +1,6 @@ --- - name: Restart network service {{ network_name }} - ansible.builtin.systemd_service: - name: "{{ network_name }}-network.service" - state: restarted - daemon_reload: true - ignore_errors: "{{ ansible_check_mode }}" + ansible.builtin.set_fact: + systemd_restart_units: "{{ systemd_restart_units + [network_name ~ '-network.service'] }}" # noqa: var-naming[no-role-prefix] + changed_when: true + notify: Apply systemd unit restarts diff --git a/roles/network/tasks/main.yaml b/roles/network/tasks/main.yaml index 6e6b42d..e1b3a23 100644 --- a/roles/network/tasks/main.yaml +++ b/roles/network/tasks/main.yaml @@ -12,7 +12,9 @@ ['Options=parent=' ~ ansible_facts.default_ipv4.interface] if network_driver == 'macvlan' else [] }} - notify: Restart network service {{ network_name }} + notify: + - Reload systemd daemon + - Restart network service {{ network_name }} - name: Add network to created networks variable ansible.builtin.set_fact: diff --git a/roles/podman/handlers/main.yaml b/roles/podman/handlers/main.yaml deleted file mode 100644 index 8f99013..0000000 --- a/roles/podman/handlers/main.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- name: Reload systemd daemon - ansible.builtin.systemd_service: - daemon_reload: true diff --git a/roles/podman/meta/main.yaml b/roles/podman/meta/main.yaml index 305f9c5..70faa3c 100644 --- a/roles/podman/meta/main.yaml +++ b/roles/podman/meta/main.yaml @@ -1,5 +1,6 @@ --- dependencies: + - role: uumas.general.systemd - role: uumas.general.compatcheck vars: compatcheck_supported_distributions: diff --git a/roles/service/handlers/main.yaml b/roles/service/handlers/main.yaml index 42f239a..0bb8141 100644 --- a/roles/service/handlers/main.yaml +++ b/roles/service/handlers/main.yaml @@ -1,7 +1,6 @@ --- - name: Restart socket for {{ service_name }} - ansible.builtin.systemd_service: - name: "{{ service_name }}.socket" - state: restarted - daemon_reload: true - ignore_errors: '{{ ansible_check_mode }}' + ansible.builtin.set_fact: + systemd_restart_units: "{{ systemd_restart_units + [servive_name ~ '.socket'] }}" # noqa: var-naming[no-role-prefix] + changed_when: true + notify: Apply systemd unit restarts diff --git a/roles/service/tasks/native_socket.yaml b/roles/service/tasks/native_socket.yaml index ee39b5c..c9db2d0 100644 --- a/roles/service/tasks/native_socket.yaml +++ b/roles/service/tasks/native_socket.yaml @@ -4,4 +4,6 @@ src: service.socket.j2 dest: /etc/systemd/system/{{ service_name }}.socket mode: "0644" - notify: Restart socket for {{ service_name }} + notify: + - Reload systemd daemon + - Restart socket for {{ service_name }} diff --git a/roles/volume/handlers/main.yaml b/roles/volume/handlers/main.yaml index a372261..f8d61e5 100644 --- a/roles/volume/handlers/main.yaml +++ b/roles/volume/handlers/main.yaml @@ -1,7 +1,6 @@ --- - name: "Restart volume service {{ volume_name }}" - ansible.builtin.systemd_service: - name: "{{ volume_name }}-volume.service" - state: restarted - daemon_reload: true - ignore_errors: "{{ ansible_check_mode }}" + ansible.builtin.set_fact: + systemd_restart_units: "{{ systemd_restart_units + [volume_name ~ '-volume.service'] }}" # noqa: var-naming[no-role-prefix] + changed_when: true + notify: Apply systemd unit restarts diff --git a/roles/volume/tasks/main.yaml b/roles/volume/tasks/main.yaml index 3538e4c..a5d4a4b 100644 --- a/roles/volume/tasks/main.yaml +++ b/roles/volume/tasks/main.yaml @@ -9,4 +9,6 @@ state: quadlet quadlet_file_mode: "0644" quadlet_options: "{{ _volume_quadlet_options }}" - notify: Restart volume service {{ volume_name }} + notify: + - Reload systemd daemon + - Restart volume service {{ volume_name }}