Skip to content

Commit d61baa9

Browse files
committed
Attempt to fix ansible_facts deprecation warnings.
1 parent d8a19c3 commit d61baa9

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

molecule/default/calico.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@
1919
pre_tasks:
2020
- name: Update apt cache.
2121
apt: update_cache=true cache_valid_time=600
22-
when: ansible_os_family == 'Debian'
22+
when: ansible_facts.os_family == 'Debian'
2323

2424
- name: Ensure test dependencies are installed (RedHat).
2525
package: name=iproute state=present
26-
when: ansible_os_family == 'RedHat'
26+
when: ansible_facts.os_family == 'RedHat'
2727

2828
- name: Ensure test dependencies are installed (Debian).
2929
package: name=iproute2 state=present
30-
when: ansible_os_family == 'Debian'
30+
when: ansible_facts.os_family == 'Debian'
3131

3232
- name: Gather facts.
3333
action: setup

molecule/default/converge.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
pre_tasks:
1616
- name: Update apt cache.
1717
apt: update_cache=true cache_valid_time=600
18-
when: ansible_os_family == 'Debian'
18+
when: ansible_facts.os_family == 'Debian'
1919

2020
- name: Ensure test dependencies are installed (RedHat).
2121
package: name=iproute state=present
22-
when: ansible_os_family == 'RedHat'
22+
when: ansible_facts.os_family == 'RedHat'
2323

2424
- name: Ensure test dependencies are installed (Debian).
2525
package: name=iproute2 state=present
26-
when: ansible_os_family == 'Debian'
26+
when: ansible_facts.os_family == 'Debian'
2727

2828
- name: Gather facts.
2929
action: setup

tasks/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
---
22
- name: Include OS-specific variables.
3-
include_vars: "{{ ansible_os_family }}.yml"
3+
include_vars: "{{ ansible_facts.os_family }}.yml"
44

55
- include_tasks: setup-RedHat.yml
6-
when: ansible_os_family == 'RedHat'
6+
when: ansible_facts.os_family == 'RedHat'
77

88
- include_tasks: setup-Debian.yml
9-
when: ansible_os_family == 'Debian'
9+
when: ansible_facts.os_family == 'Debian'
1010

1111
- name: Install Kubernetes packages.
1212
package:

tasks/sysctl-setup.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
name: "{{ procps_package }}"
55
state: present
66
when: >
7-
ansible_distribution != 'Debian'
8-
or ansible_distribution_major_version | int < 10
7+
ansible_facts.distribution != 'Debian'
8+
or ansible_facts.distribution_major_version | int < 10
99
1010
- name: Ensure module br_netfilter is loaded
1111
modprobe:
@@ -24,6 +24,6 @@
2424
- net.bridge.bridge-nf-call-iptables
2525
- net.bridge.bridge-nf-call-ip6tables
2626
when: >
27-
( ansible_distribution != 'Debian'
28-
or ansible_distribution_major_version | int < 10
27+
( ansible_facts.distribution != 'Debian'
28+
or ansible_facts.distribution_major_version | int < 10
2929
) and not ansible_virtualization_type == "docker"

0 commit comments

Comments
 (0)