Skip to content

Commit e831964

Browse files
authored
Merge pull request #421 from Normo/394-remove-keepalived_notification_email
Remove deprecated keepalived_notification_email variable from keepalived role
2 parents ddc7840 + b44c361 commit e831964

File tree

2 files changed

+3
-18
lines changed

2 files changed

+3
-18
lines changed

molecule/keepalived/molecule.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,9 @@ provisioner:
3535
- "172.17.0.3"
3636
- "172.17.0.4"
3737
keepalived_virtual_ip_address: "172.17.0.20"
38-
keepalived_notification_email: "[email protected]"
39-
# keepalived_notification_emails:
40-
# - "root@localhost"
41-
38+
keepalived_notification_emails:
39+
- "root@localhost"
40+
4241
verifier:
4342
name: "ansible"
4443
scenario:

roles/keepalived/tasks/main.yml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,6 @@
1313
fail_msg: "Some mandatory variables are not set."
1414
success_msg: "All mandatory variables are set."
1515

16-
- name: "Variable keepalived_notification_email is deprecated"
17-
when: "keepalived_notification_email | default('') | length > 0"
18-
block:
19-
20-
- name: "Set keepalived_notification_emails variable"
21-
ansible.builtin.set_fact:
22-
keepalived_notification_emails: ["{{ keepalived_notification_email }}"]
23-
24-
- name: "Show deprecation warning"
25-
ansible.builtin.debug:
26-
msg:
27-
- "The variable keepalived_notification_email is deprecated and will be removed in the next major release."
28-
- "Please use list variable 'keepalived_notification_emails' instead."
29-
3016
- name: "Install dependencies for Keepalived."
3117
become: true
3218
ansible.builtin.package:

0 commit comments

Comments
 (0)