From 96a7eabbaca5a4ffd3b6fe9e6a1bf3cc754a36c5 Mon Sep 17 00:00:00 2001 From: June Date: Wed, 4 Nov 2026 17:15:48 +0100 Subject: [PATCH] ansible-pull(role): move ansible-pull reboot logic to script as well Do this to unify the way these helper scripts get deployed. --- roles/ansible_pull/files/ansible-pull-reboot.service | 3 +-- roles/ansible_pull/files/ansible-pull-reboot.sh | 6 ++++++ roles/ansible_pull/tasks/main.yaml | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 roles/ansible_pull/files/ansible-pull-reboot.sh diff --git a/roles/ansible_pull/files/ansible-pull-reboot.service b/roles/ansible_pull/files/ansible-pull-reboot.service index e70c082e..d6e5bc8d 100644 --- a/roles/ansible_pull/files/ansible-pull-reboot.service +++ b/roles/ansible_pull/files/ansible-pull-reboot.service @@ -4,5 +4,4 @@ After=ansible-pull.service [Service] Type=oneshot -# Reboot, if /var/run/reboot-required or /var/run/ansible-reboot-required exist. -ExecStart=/usr/bin/bash -c 'if [ -e /var/run/reboot-required ] || [ -e /var/run/ansible-reboot-required ]; then systemctl reboot; fi' +ExecStart=ansible-pull-reboot diff --git a/roles/ansible_pull/files/ansible-pull-reboot.sh b/roles/ansible_pull/files/ansible-pull-reboot.sh new file mode 100644 index 00000000..940334a5 --- /dev/null +++ b/roles/ansible_pull/files/ansible-pull-reboot.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +# Reboot, if /var/run/reboot-required or /var/run/ansible-reboot-required exist. +if [ -e /var/run/reboot-required ] || [ -e /var/run/ansible-reboot-required ]; then + systemctl reboot +fi diff --git a/roles/ansible_pull/tasks/main.yaml b/roles/ansible_pull/tasks/main.yaml index 49e96f2b..0d2b1d3b 100644 --- a/roles/ansible_pull/tasks/main.yaml +++ b/roles/ansible_pull/tasks/main.yaml @@ -34,6 +34,7 @@ become: true loop: - ansible-pull-successful-run-timestamp-exporter + - ansible-pull-reboot - name: ensure ansible-pull-failure-notify script installation exists ansible.builtin.template: