[EVO] Ajouter les scripts de notifications

Reviewed-on: #1

README.md

@@ -58,10 +58,16 @@ Passer en unicast en utilisant cette liste d'IP.
 
 *<span style="text-decoration: underline">Valeur par défaut:</span> aucune*
 
-### keepalived_notify_script_enabled
+### keepalived_scripts_path
 
-Booléen permettant d'activer le script de notification.<br>
+Emplacement où les scripts de keepalived seront déployés.
-Le script est déployé dans `/etc/keepalived/notify.sh`.
+
+*<span style="text-decoration: underline">Valeur par défaut:</span> aucune*
+
+### keepalived_notify_{master,backup,fault,stop}
+
+Booléen permettant d'activer ou non le script en fonction de l'état de keepalived.<br>
+Les scripts sont déployés dans `<keepalived_scripts_path>/notify_{master,backup,fault,stop}.sh`.
 
 *<span style="text-decoration: underline">Valeur par défaut:</span> `false`*
 

defaults/main.yml

@@ -13,22 +13,22 @@ keepalived_ipv6: ""
 
 keepalived_peers: []
 
-keepalived_notify_enable: false
+keepalived_scripts_path: ""
-keepalived_notify_pre: {}
+
-keepalived_notify_is_master: {}
+keepalived_notify_master: false
-keepalived_notify_is_backup: {}
+keepalived_notify_backup: false
-keepalived_notify_is_fault: {}
+keepalived_notify_fault: false
-keepalived_notify_by_default: {}
+keepalived_notify_stop: false
 
 keepalived_track_scripts: []
-# Example:
+# Exemple:
 #  - name: check_haproxy_8080
 #    command: /usr/bin/nc -zv 127.0.0.1 8080
 #  - name: check_haproxy_8081
 #    command: /usr/bin/nc -zv 127.0.0.1 8081
 
 keepalived_track_processes: []
-# Example:
+# Exemple:
 #  - name: check_haproxy
 #    search: /usr/sbin/haproxy
 #    quorum: 2

handlers/main.yml

@@ -1,7 +1,7 @@
 ---
 # handlers file for keepalived
 
-- name: Restart keepalived.service
+- name: Redémarrer keepalived.service
   become: true
   ansible.builtin.systemd:
     state: restarted

meta/main.yml

@@ -1,7 +1,7 @@
 galaxy_info:
   namespace: ykn
   author: pulsar89.5
-  description: Deploy keepalived
+  description: Rôle de déploiement de keepalived
 
   license: GPL-3.0-or-later
 
@@ -14,3 +14,10 @@ galaxy_info:
 
 dependencies:
   - role: users
+    vars:
+      users:
+        - name: keepalived_script
+          comment: "Dedicated user for keepalived script"
+          update_password: on_create
+          password_lock: true
+          shell: /bin/bash

tasks/configuration.yml

@@ -1,37 +0,0 @@
----
-# tasks file for keepalived
-
-- name: Deploy configuration
-  ansible.builtin.template:
-    src: keepalived.j2
-    dest: /etc/keepalived/keepalived.conf
-    owner: root
-    group: root
-    mode: u=rw,g=r,o=r
-  become: true
-  notify: Restart keepalived.service
-
-- name: Deploy sudoers configuration
-  ansible.builtin.template:
-    src: sudoers.j2
-    dest: /etc/sudoers.d/keepalived_script
-    owner: root
-    group: keepalived_script
-    mode: u=rwx,g=rx,o=
-    validate: /usr/sbin/visudo -cf %s
-  when:
-    - keepalived_notify_enable
-    - keepalived_sudoers_cmd | length > 0
-  become: true
-  notify: Restart keepalived.service
-
-- name: Deploy notify script
-  ansible.builtin.template:
-    src: notify.bash.j2
-    dest: /etc/keepalived/notify.bash
-    owner: root
-    group: keepalived_script
-    mode: u=rwx,g=rx,o=
-  when: keepalived_notify_enable
-  become: true
-  notify: Restart keepalived.service

tasks/installation.yml

@@ -1,7 +0,0 @@
----
-# tasks file for keepalived
-
-- name: Install keepalived
-  ansible.builtin.apt:
-    name: keepalived
-  become: true

tasks/main.yml

@@ -1,10 +1,45 @@
 ---
 # tasks file for keepalived
 
-- name: Import installation tasks
+- name: Installer le paquet
-  ansible.builtin.import_tasks:
+  ansible.builtin.apt:
-    file: installation.yml
+    name: keepalived
+  become: true
 
-- name: Import configuration tasks
+- name: Déployer la configuration
-  ansible.builtin.import_tasks:
+  ansible.builtin.template:
-    file: configuration.yml
+    owner: root
+    group: root
+    mode: u=rw,g=r,o=r
+    src: keepalived.j2
+    dest: /etc/keepalived/keepalived.conf
+  become: true
+  notify: Redémarrer keepalived.service
+
+- name: Créer le dossier de déploiement des scripts
+  ansible.builtin.file:
+    path: /srv/keepalived
+    owner: root
+    group: root
+    mode: u=rwX,g=rX,o=rX
+    state: directory
+  when: keepalived_scripts_path | length > 0
+  become: true
+
+- name: Déployer les scripts
+  ansible.builtin.copy:
+    src: keepalived/notify_{{ item | split('_') | last }}.sh
+    dest: "{{ keepalived_scripts_path }}"
+    owner: keepalived_script
+    group: keepalived_script
+    mode: u=rx,g=rx,o=
+  when:
+    - keepalived_scripts_path | length > 0
+    - vars[item]
+  loop:
+    - keepalived_notify_master
+    - keepalived_notify_backup
+    - keepalived_notify_fault
+    - keepalived_notify_stop
+  become: true
+  notify: Redémarrer keepalived.service

templates/keepalived.j2

@@ -13,14 +13,13 @@ global_defs {
     smtp_connect_timeout 30
 {% endif %}
 
-  script_user keepalived_script
   enable_script_security
   max_auto_priority 50
 }
 
 {% for script in keepalived_track_scripts %}
 vrrp_script {{ script.name }} {
-  script "{{ script.command }}"
+  script {{ script.command }}
   interval {{ script.interval }}
 }
 {% endfor %}
@@ -42,13 +41,8 @@ vrrp_instance VIP_{{ keepalived_uid }} {
   advert_int 1
 
 {% if keepalived_peers | length > 0 %}
-  unicast_src_ip {{ ansible_facts[keepalived_interface]['ipv4']['address'] }}
   unicast_peer {
-{% for peer in keepalived_peers %}
+    {{ keepalived_peers | join('\n') | indent(width=4) }}
-{% if peer != ansible_facts[keepalived_interface]['ipv4']['address'] %}
-    {{ peer }}
-{% endif %}
-{% endfor %}
   }
 {% endif %}
 
@@ -64,8 +58,17 @@ vrrp_instance VIP_{{ keepalived_uid }} {
   }
 {% endif %}
 
-{% if keepalived_notify_enable %}
+{% if keepalived_notify_master %}
-  notify /etc/keepalived/notify.bash
+  notify_master {{ keepalived_scripts_path }}/notify_master.sh
+{% endif %}
+{% if keepalived_notify_backup %}
+  notify_backup {{ keepalived_scripts_path }}/notify_backup.sh
+{% endif %}
+{% if keepalived_notify_fault %}
+  notify_fault {{ keepalived_scripts_path }}/notify_fault.sh
+{% endif %}
+{% if keepalived_notify_stop %}
+  notify_stop {{ keepalived_scripts_path }}/notify_stop.sh
 {% endif %}
 
 {% if keepalived_track_scripts | length > 0 %}

templates/notify.bash.j2

@@ -1,38 +0,0 @@
-#!/bin/bash
-# {{ ansible_managed }}
-
-TYPE=$1
-NAME=$2
-STATE=$3
-
-{% if keepalived_notify_pre | length > 0 %}
-{{ keepalived_notify_pre }}
-{% endif %}
-
-# Use keepalived state
-case $STATE in
-{% if keepalived_notify_is_master | length > 0 %}
-  "MASTER")
-    {{ keepalived_notify_is_master | indent(4) }}
-    exit 0
-  ;;
-{% endif %}
-{% if keepalived_notify_is_backup | length > 0 %}
-  "BACKUP")
-    {{ keepalived_notify_is_backup | indent(4) }}
-    exit 0
-  ;;
-{% endif %}
-{% if keepalived_notify_is_fault | length > 0 %}
-  "FAULT")
-    {{ keepalived_notify_is_fault | indent(4) }}
-    exit 0
-  ;;
-{% endif %}
-{% if keepalived_notify_by_default | length > 0 %}
-  *)
-    {{ keepalived_notify_by_default | indent(4) }}
-    exit 1
-  ;;
-{% endif %}
-esac

templates/sudoers.j2

@@ -1,5 +0,0 @@
-# {{ ansible_managed }}
-
-{% for cmd in keepalived_sudoers_cmd %}
-keepalived_script ALL=(ALL) NOPASSWD:{{ cmd }}
-{% endfor %}

vars/main.yml

@@ -1,9 +0,0 @@
----
-# vars file for keepalived
-
-users:
-  - name: keepalived_script
-    comment: "Dedicated user for keepalived script"
-    update_password: on_create
-    password_lock: true
-    shell: /bin/bash