Skip to content

Commit 2ae2e2a

Browse files
committed
Attempt to fix ansible_facts deprecation warnings.
1 parent 54ea6e3 commit 2ae2e2a

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

molecule/default/converge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
pre_tasks:
1111
- name: Update apt cache.
1212
apt: update_cache=true cache_valid_time=600
13-
when: ansible_os_family == 'Debian'
13+
when: ansible_facts.os_family == 'Debian'
1414
changed_when: false
1515

1616
roles:

molecule/default/source-install.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
pre_tasks:
1212
- name: Update apt cache.
1313
apt: update_cache=true cache_valid_time=600
14-
when: ansible_os_family == 'Debian'
14+
when: ansible_facts.os_family == 'Debian'
1515
changed_when: false
1616

1717
roles:

tasks/install-from-source.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
---
22
- name: Include OS-specific variables (RedHat).
3-
include_vars: "{{ ansible_os_family }}.yml"
3+
include_vars: "{{ ansible_facts.os_family }}.yml"
44
when:
5-
- ansible_os_family == "RedHat"
6-
- ansible_distribution != "Fedora"
5+
- ansible_facts.os_family == "RedHat"
6+
- ansible_facts.distribution != "Fedora"
77

88
- name: Include OS-specific variables (Fedora).
9-
include_vars: "{{ ansible_distribution }}.yml"
10-
when: ansible_distribution == "Fedora"
9+
include_vars: "{{ ansible_facts.distribution }}.yml"
10+
when: ansible_facts.distribution == "Fedora"
1111

1212
- name: Include OS-specific variables (Debian).
13-
include_vars: "{{ ansible_os_family }}.yml"
14-
when: ansible_os_family == "Debian"
13+
include_vars: "{{ ansible_facts.os_family }}.yml"
14+
when: ansible_facts.os_family == "Debian"
1515

1616
- name: Define git_install_from_source_dependencies.
1717
set_fact:

tasks/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@
66
enablerepo: "{{ git_enablerepo | default(omit, true) }}"
77
when:
88
- not git_install_from_source | bool
9-
- ansible_os_family == 'RedHat'
9+
- ansible_facts.os_family == 'RedHat'
1010

1111
- name: Update apt cache (Debian).
1212
apt: update_cache=true cache_valid_time=86400
13-
when: ansible_os_family == 'Debian'
13+
when: ansible_facts.os_family == 'Debian'
1414

1515
- name: Ensure git is installed (Debian).
1616
apt:
1717
name: "{{ git_packages }}"
1818
state: present
1919
when:
2020
- not git_install_from_source | bool
21-
- ansible_os_family == 'Debian'
21+
- ansible_facts.os_family == 'Debian'
2222

2323
- import_tasks: install-from-source.yml
2424
when: git_install_from_source | bool

0 commit comments

Comments
 (0)