Merge pull request 'cleanPlaybook' (#3) from cleanPlaybook into master

Reviewed-on: #3

defaults/main.yml

@@ -21,14 +21,14 @@ keepalived_notify_is_fault: {}
 keepalived_notify_by_default: {}
 
 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
 
@@ -13,4 +13,12 @@ galaxy_info:
         - all
 
 dependencies:
+  - role: nftables
   - role: users
+    vars:
+      users_role_keepalived:
+        - 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,42 @@
 ---
 # 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
+    src: keepalived.j2
+    dest: /etc/keepalived/keepalived.conf
+    owner: root
+    group: root
+    mode: u=rw,g=r,o=r
+  become: true
+  notify: Redémarrer keepalived.service
+
+- name: Déployer le fichier de configuration de sudoers
+  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: Redémarrer keepalived.service
+
+- name: Déployer les scripts
+  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: Redémarrer keepalived.service

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