From fac775cb9d87b0ad7b3b2a2bd381b1b19e54904b Mon Sep 17 00:00:00 2001 From: Alexander Gorelyshev Date: Fri, 26 Dec 2025 21:58:02 +0400 Subject: [PATCH] Simplify handler logic --- roles/promtail/handlers/main.yml | 8 ++------ roles/promtail/tasks/main.yml | 13 +++---------- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/roles/promtail/handlers/main.yml b/roles/promtail/handlers/main.yml index d1c06ac..020808a 100644 --- a/roles/promtail/handlers/main.yml +++ b/roles/promtail/handlers/main.yml @@ -1,11 +1,7 @@ --- - -- name: "Restart the Promtail daemon" +- name: "Enable and restart the Promtail daemon" ansible.builtin.systemd: name: promtail state: restarted - - -- name: "Reload the Promtail daemon configuration" - ansible.builtin.systemd: + enabled: true daemon_reload: true diff --git a/roles/promtail/tasks/main.yml b/roles/promtail/tasks/main.yml index 127c10c..c3897fe 100644 --- a/roles/promtail/tasks/main.yml +++ b/roles/promtail/tasks/main.yml @@ -51,7 +51,6 @@ changed_when: false - name: "Assert version correctness" - notify: "Restart the Promtail daemon" ansible.builtin.assert: that: "promtail_version in promtail_version_check.stdout" success_msg: "Expected Promtail version available ({{ promtail_version }})" @@ -59,6 +58,7 @@ rescue: - name: "Install Promtail if its not present" + notify: "Enable and restart the Promtail daemon" ansible.builtin.unarchive: src: "https://github.com/grafana/loki/releases/download/v\ {{ promtail_version }}/promtail-linux-amd64.zip" @@ -81,7 +81,7 @@ - name: "Template the systemd unit file" - notify: "Reload the Promtail daemon configuration" + notify: "Enable and restart the Promtail daemon" ansible.builtin.template: src: promtail.service.j2 dest: /etc/systemd/system/promtail.service @@ -91,17 +91,10 @@ - name: "Template Promtail config file" - notify: "Restart the Promtail daemon" + notify: "Enable and restart the Promtail daemon" ansible.builtin.template: src: templates/promtail.yml.j2 dest: /usr/local/bin/config-promtail.yml owner: root group: root mode: "0644" - - -- name: "Enable and start Promtail daemon" - ansible.builtin.systemd: - name: promtail - state: started - enabled: true