diff --git a/roles/ansible_pull/files/ansible-pull-reboot.service b/roles/ansible_pull/files/ansible-pull-reboot.service deleted file mode 100644 index d6e5bc8d..00000000 --- a/roles/ansible_pull/files/ansible-pull-reboot.service +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Description=ansible-pull reboot, if required -After=ansible-pull.service - -[Service] -Type=oneshot -ExecStart=ansible-pull-reboot diff --git a/roles/ansible_pull/files/ansible-pull-reboot.sh b/roles/ansible_pull/files/ansible-pull-reboot.sh deleted file mode 100644 index 940334a5..00000000 --- a/roles/ansible_pull/files/ansible-pull-reboot.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/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/files/ansible-pull-successful-run-timestamp-exporter.service b/roles/ansible_pull/files/ansible-pull-successful-run-timestamp-exporter.service deleted file mode 100644 index ebed50ce..00000000 --- a/roles/ansible_pull/files/ansible-pull-successful-run-timestamp-exporter.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=ansible-pull successful run timestamp exporter -After=ansible-pull.service -Before=ansible-pull-reboot.service - -[Service] -Type=oneshot -ExecStart=ansible-pull-successful-run-timestamp-exporter diff --git a/roles/ansible_pull/files/ansible-pull-successful-run-timestamp-exporter.sh b/roles/ansible_pull/files/ansible-pull-successful-run-timestamp-exporter.sh deleted file mode 100644 index 90969675..00000000 --- a/roles/ansible_pull/files/ansible-pull-successful-run-timestamp-exporter.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -set -eo pipefail - -echo "ansible_pull_last_successful_run_timestamp_seconds $(date +%s)" > /var/lib/node_exporter_textfile/ansible_pull.prom.$$ -mv /var/lib/node_exporter_textfile/ansible_pull.prom.$$ /var/lib/node_exporter_textfile/ansible_pull.prom diff --git a/roles/ansible_pull/tasks/main.yaml b/roles/ansible_pull/tasks/main.yaml index d8915be7..61a2635f 100644 --- a/roles/ansible_pull/tasks/main.yaml +++ b/roles/ansible_pull/tasks/main.yaml @@ -24,28 +24,14 @@ virtualenv: /usr/local/lib/ansible_pull_venv become: true -- name: ensure helper script installations exist - ansible.builtin.copy: - src: "{{ item }}.sh" - dest: "/usr/local/sbin/{{ item }}" - owner: root - group: root - mode: "0755" - become: true - loop: - - ansible-pull-successful-run-timestamp-exporter - - ansible-pull-reboot - -- name: ensure templated helper script installations exists +- name: ensure ansible-pull-failure-notify script installation exists ansible.builtin.template: - src: "{{ item }}.sh.j2" - dest: "/usr/local/sbin/{{ item }}" + src: ansible-pull-failure-notify.sh.j2 + dest: /usr/local/sbin/ansible-pull-failure-notify.sh owner: root group: root mode: "0755" become: true - loop: - - ansible-pull-failure-notify - name: ensure secrets directory exists ansible.builtin.file: @@ -65,7 +51,7 @@ group: "{{ ansible_pull__user }}" become: true -- name: ensure templated systemd services exists +- name: ensure systemd services exists ansible.builtin.template: src: "{{ item }}.j2" dest: "/etc/systemd/system/{{ item }}" @@ -75,21 +61,7 @@ become: true loop: - ansible-pull.service - notify: - - systemd daemon reload - -- name: ensure systemd services exists - ansible.builtin.copy: - src: "{{ item }}" - dest: "/etc/systemd/system/{{ item }}" - owner: root - group: root - mode: "0644" - become: true - loop: - ansible-pull-failure-notify.service - - ansible-pull-reboot.service - - ansible-pull-successful-run-timestamp-exporter.service notify: - systemd daemon reload diff --git a/roles/ansible_pull/files/ansible-pull-failure-notify.service b/roles/ansible_pull/templates/ansible-pull-failure-notify.service.j2 similarity index 59% rename from roles/ansible_pull/files/ansible-pull-failure-notify.service rename to roles/ansible_pull/templates/ansible-pull-failure-notify.service.j2 index 30d90091..fa5d471d 100644 --- a/roles/ansible_pull/files/ansible-pull-failure-notify.service +++ b/roles/ansible_pull/templates/ansible-pull-failure-notify.service.j2 @@ -3,5 +3,5 @@ Description=ansible-pull failure notifier [Service] Type=oneshot -ExecStart=ansible-pull-failure-notify +ExecStart=/usr/local/sbin/ansible-pull-failure-notify.sh User=root diff --git a/roles/ansible_pull/templates/ansible-pull.service.j2 b/roles/ansible_pull/templates/ansible-pull.service.j2 index 7f12bc4e..8b5c9e86 100644 --- a/roles/ansible_pull/templates/ansible-pull.service.j2 +++ b/roles/ansible_pull/templates/ansible-pull.service.j2 @@ -3,7 +3,6 @@ Description=ansible-pull for configuration and maintenance After=network-online.target Wants=network-online.target OnFailure=ansible-pull-failure-notify.service -OnSuccess=ansible-pull-successful-run-timestamp-exporter.service ansible-pull-reboot.service [Service] Type=oneshot @@ -20,3 +19,6 @@ ExecStart=/usr/local/lib/ansible_pull_venv/bin/ansible-pull \ --inventory "{{ ansible_pull__inventory }}" \ "{{ ansible_pull__playbook }}" User={{ ansible_pull__user }} +ExecStartPost=/usr/bin/bash -c 'echo "ansible_pull_last_successful_run_timestamp_seconds $(date +%s)" > /var/lib/node_exporter_textfile/ansible_pull.prom.$$; mv /var/lib/node_exporter_textfile/ansible_pull.prom.$$ /var/lib/node_exporter_textfile/ansible_pull.prom' +# Reboot, if /var/run/reboot-required or /var/run/ansible-reboot-required exist. +ExecStartPost=/usr/bin/bash -c 'if [ -e /var/run/reboot-required ] || [ -e /var/run/ansible-reboot-required ]; then sudo systemctl reboot; fi'