Merge pull request #391 from Normo/keepalived-notification-email

Convert keepalived_notification_email to a list

Author: Normo

molecule/keepalived/converge.yml

@@ -7,11 +7,6 @@
 
 - name: "Converge"
   hosts: "all"
-  vars:
-    keepalived_unicast_peers:
-      - "172.17.0.3"
-      - "172.17.0.4"
-    keepalived_virtual_ip_address: "172.17.0.20"
   tasks:
     - name: "Include keepalived role"
       ansible.builtin.include_role:

molecule/keepalived/molecule.yml

@@ -27,6 +27,18 @@ provisioner:
     check: "converge.yml"
     converge: "converge.yml"
     verify: "verify.yml"
+  inventory:
+    hosts:
+      all:
+        vars:
+          keepalived_unicast_peers:
+            - "172.17.0.3"
+            - "172.17.0.4"
+          keepalived_virtual_ip_address: "172.17.0.20"
+          keepalived_notification_email: "[email protected]"
+          # keepalived_notification_emails:
+          #   - "root@localhost"
+          #   - "[email protected]"
 verifier:
   name: "ansible"
 scenario:

roles/keepalived/README.md

@@ -153,10 +153,11 @@ keepalived_pid_file_path: "/run/keepalived/keepalived.pid"
 
 #### Configure notification email address
 
-Configure recipient of notification emails:
+List of email accounts that will receive notification mails:
 
 ```yaml
-keepalived_notification_email: 'name@localhost'
+keepalived_notification_emails:
+  - 'root@localhost'
 ```
 
 #### Configure notification sender

roles/keepalived/defaults/main.yml

@@ -44,8 +44,8 @@ keepalived_service_file_path: "/etc/systemd/system/keepalived.service"
 keepalived_pid_file_path: "/run/keepalived/keepalived.pid"
 
 
-# Configure notification email address
-keepalived_notification_email: "name@localhost"
+# Configure email accounts that will receive notification mails
+keepalived_notification_emails: ["root@localhost"]
 # Configure notification sender
 keepalived_notification_email_from: "keepalived@localhost"
 # Configure SMTP Server

roles/keepalived/tasks/main.yml

@@ -13,6 +13,20 @@
     fail_msg: "Some mandatory variables are not set."
     success_msg: "All mandatory variables are set."
 
+- name: "Variable keepalived_notification_email is deprecated"
+  when: "keepalived_notification_email | default('') | length > 0"
+  block:
+
+    - name: "Set keepalived_notification_emails variable"
+      ansible.builtin.set_fact:
+        keepalived_notification_emails: ["{{ keepalived_notification_email }}"]
+
+    - name: "Show deprecation warning"
+      ansible.builtin.debug:
+        msg:
+          - "The variable keepalived_notification_email is deprecated and will be removed in the next major release."
+          - "Please use list variable 'keepalived_notification_emails' instead."
+
 - name: "Install dependencies for Keepalived."
   become: true
   ansible.builtin.package:

roles/keepalived/templates/keepalived.conf.j2

@@ -11,12 +11,16 @@ global_defs {
 {% if keepalived_set_script_security_flag %}
     enable_script_security
 {% endif %}
+{% if keepalived_notification_emails | default([]) | length > 0 %}
     notification_email {
-        {{ keepalived_notification_email }}
+{% for email in keepalived_notification_emails %}
+        {{ email }}
+{% endfor %}
     }
     notification_email_from {{ keepalived_notification_email_from }}
     smtp_server {{ keepalived_smtp_server }}
     smtp_connect_timeout 30
+{% endif %}
 {% if keepalived_router_id is defined %}
     router_id {{ keepalived_router_id }}
 {% endif %}