Skip to content

Commit 4c0de18

Browse files
committed
Attempt to fix ansible_facts deprecation warnings.
1 parent 117ba98 commit 4c0de18

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

molecule/default/converge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
pre_tasks:
1515
- name: Update apt cache.
1616
apt: update_cache=true cache_valid_time=1200
17-
when: ansible_os_family == 'Debian'
17+
when: ansible_facts.os_family == 'Debian'
1818
changed_when: false
1919

2020
roles:

tasks/disable-other-firewalls.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
ignore_errors: true
66
changed_when: false
77
when:
8-
- ansible_os_family == "RedHat"
8+
- ansible_facts.os_family == "RedHat"
99
- firewall_disable_firewalld
1010
check_mode: false
1111

@@ -15,7 +15,7 @@
1515
state: stopped
1616
enabled: false
1717
when:
18-
- ansible_os_family == "RedHat"
18+
- ansible_facts.os_family == "RedHat"
1919
- firewall_disable_firewalld
2020
- firewalld_installed.rc == 0
2121

@@ -25,7 +25,7 @@
2525
ignore_errors: true
2626
changed_when: false
2727
when:
28-
- ansible_distribution == "Ubuntu"
28+
- ansible_facts.distribution == "Ubuntu"
2929
- firewall_disable_ufw
3030
check_mode: false
3131

@@ -35,7 +35,7 @@
3535
state: stopped
3636
enabled: false
3737
when:
38-
- ansible_distribution == "Ubuntu"
38+
- ansible_facts.distribution == "Ubuntu"
3939
- firewall_disable_ufw
4040
- ufw_installed.rc == 0
4141

@@ -45,7 +45,7 @@
4545
ignore_errors: true
4646
changed_when: false
4747
when:
48-
- ansible_distribution == "Archlinux"
48+
- ansible_facts.distribution == "Archlinux"
4949
- firewall_disable_ufw
5050
check_mode: false
5151

@@ -55,6 +55,6 @@
5555
state: stopped
5656
enabled: false
5757
when:
58-
- ansible_distribution == "Archlinux"
58+
- ansible_facts.distribution == "Archlinux"
5959
- firewall_disable_ufw
6060
- ufw_installed.rc == 0

tasks/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
owner: root
2424
group: root
2525
mode: 0755
26-
when: "ansible_service_mgr != 'systemd'"
26+
when: "ansible_facts.service_mgr != 'systemd'"
2727

2828
- name: Copy firewall systemd unit file into place (for systemd systems).
2929
template:
@@ -32,7 +32,7 @@
3232
owner: root
3333
group: root
3434
mode: 0644
35-
when: "ansible_service_mgr == 'systemd'"
35+
when: "ansible_facts.service_mgr == 'systemd'"
3636

3737
- name: Configure the firewall service.
3838
service:

0 commit comments

Comments
 (0)