Skip to content

Commit

Permalink
Merge pull request #66 from rlex/master
Browse files Browse the repository at this point in the history
Deprecation fixes
  • Loading branch information
evrardjp authored Oct 17, 2018
2 parents b15d360 + 1a1fcee commit 4dc47bc
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 12 deletions.
2 changes: 1 addition & 1 deletion meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ galaxy_info:
author: Jean-Philippe Evrard
description: This role installs and configure keepalived based on a variable file
license: Apache
min_ansible_version: 2.3
min_ansible_version: 2.4
platforms:
- name: EL
versions:
Expand Down
10 changes: 5 additions & 5 deletions tasks/keepalived_install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
content: "{{ prevent_start_file_content }}"
when:
- ansible_os_family | lower == 'debian'
- check_if_present | changed
- check_if_present is changed
- ansible_service_mgr is defined
- ansible_service_mgr != 'systemd'
tags:
Expand All @@ -80,7 +80,7 @@
dest: "{{ prevent_start_file }}"
when:
- ansible_os_family | lower == 'debian'
- check_if_present | changed
- check_if_present is changed
- ansible_service_mgr is defined
- ansible_service_mgr == 'systemd'
tags:
Expand All @@ -99,7 +99,7 @@
file:
path: /etc/keepalived/samples/
state: absent
when:
when:
- ansible_os_family | lower == 'debian'

- name: Revert keepalived start prevention
Expand All @@ -108,13 +108,13 @@
state: absent
when:
- ansible_os_family | lower == 'debian'
- check_if_present | changed
- check_if_present is changed
tags:
- keepalived-prevent-start

- name: "Systemd daemon_reload"
command: systemctl daemon-reload
changed_when: check_if_present | changed
changed_when: check_if_present is changed
when:
- ansible_service_mgr is defined
- ansible_service_mgr == 'systemd'
Expand Down
11 changes: 5 additions & 6 deletions tasks/keepalived_selinux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,12 @@

- name: Ensure SELinux packages are installed
yum:
name: "{{ item }}"
name:
- libselinux
- libselinux-devel
- checkpolicy
- policycoreutils-python
state: present
with_items:
- libselinux
- libselinux-devel
- checkpolicy
- policycoreutils-python
when:
- '"keepalived_ping" not in selinux_modules.stdout'

Expand Down

0 comments on commit 4dc47bc

Please sign in to comment.