From 6995576e079d633f09f4fd1c81ce9f5716233dc4 Mon Sep 17 00:00:00 2001 From: Alexandre Le Gall Date: Tue, 10 Oct 2023 15:22:58 +0200 Subject: [PATCH] [EVO] Nettoyer le playbook --- defaults/main.yml | 3 ++- tasks/main.yml | 29 +++++++++++++++-------------- templates/keepalived.j2 | 2 +- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index b1aea24..7ce4f78 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -13,7 +13,8 @@ keepalived_ipv6: "" keepalived_peers: [] -keepalived_notify_script_enabled: false +keepalived_sudoers_src: "" +keepalived_notify_script_src: "" keepalived_track_scripts: [] # Exemple: diff --git a/tasks/main.yml b/tasks/main.yml index ecd3baa..ccad493 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -16,24 +16,25 @@ become: true notify: Redémarrer keepalived.service -- name: Déployer les scripts - ansible.builtin.copy: - src: keepalived/notify.sh - dest: /etc/keepalived/ - owner: keepalived_script - group: keepalived_script - mode: u=rx,g=rx,o= - when: keepalived_notify_script_enabled - become: true - notify: Redémarrer keepalived.service - - name: Déployer le fichier de configuration de sudoers ansible.builtin.copy: - src: keepalived/sudoers - dest: /etc/sudoers.d/keepalived + src: "{{ keepalived_sudoers_src }}" + dest: /etc/sudoers.d/keepalived_script owner: root group: root mode: u=rw,g=r,o=r validate: /usr/sbin/visudo -cf %s - when: "'keepalived/sudoers' is file" + when: keepalived_sudoers_src is file become: true + notify: Redémarrer keepalived.service + +- name: Déployer les scripts + ansible.builtin.copy: + src: "{{ keepalived_notify_script_src }}" + dest: /etc/keepalived/ + owner: keepalived_script + group: keepalived_script + mode: u=rx,g=rx,o= + when: keepalived_notify_script_src is file + become: true + notify: Redémarrer keepalived.service diff --git a/templates/keepalived.j2 b/templates/keepalived.j2 index 3aab2be..5f5a62f 100644 --- a/templates/keepalived.j2 +++ b/templates/keepalived.j2 @@ -64,7 +64,7 @@ vrrp_instance VIP_{{ keepalived_uid }} { } {% endif %} -{% if keepalived_notify_script_enabled %} +{% if keepalived_notify_script_src | length > 0 %} notify /etc/keepalived/notify.sh {% endif %}