Skip to content

Commit 4bbd846

Browse files
committed
refactor: handle INJECT_FACTS_AS_VARS=false by using ansible_facts instead
Ansible 2.20 has deprecated the use of Ansible facts as variables. For example, `ansible_distribution` is now deprecated in favor of `ansible_facts["distribution"]`. This is due to making the default setting `INJECT_FACTS_AS_VARS=false`. For now, this will create WARNING messages, but in Ansible 2.24 it will be an error. See https://docs.ansible.com/projects/ansible/latest/porting_guides/porting_guide_core_2.20.html#inject-facts-as-vars Signed-off-by: Rich Megginson <rmeggins@redhat.com>
1 parent 5b575d6 commit 4bbd846

File tree

7 files changed

+19
-19
lines changed

7 files changed

+19
-19
lines changed

tests/tasks/assert_certificate_parameters.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
use: "{{ (__certificate_is_ostree | d(false)) |
2727
ternary('ansible.posix.rhel_rpm_ostree', omit) }}"
2828
when:
29-
- ansible_distribution_major_version == "7"
30-
- ansible_os_family == "RedHat"
29+
- ansible_facts["distribution_major_version"] == "7"
30+
- ansible_facts["os_family"] == "RedHat"
3131

3232
- name: Ensure python3 is installed
3333
package:
@@ -37,8 +37,8 @@
3737
use: "{{ (__certificate_is_ostree | d(false)) |
3838
ternary('ansible.posix.rhel_rpm_ostree', omit) }}"
3939
when:
40-
- ansible_distribution_major_version != "7"
41-
- ansible_os_family == "RedHat"
40+
- ansible_facts["distribution_major_version"] != "7"
41+
- ansible_facts["os_family"] == "RedHat"
4242

4343
- name: Retrieve certificate file stats
4444
stat:

tests/tasks/setup_ipa.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,20 +67,20 @@
6767
hostname:
6868
name: ipaserver.test.local
6969
use: systemd
70-
when: ansible_facts.os_family == "RedHat"
70+
when: ansible_facts["os_family"] == "RedHat"
7171

7272
- name: Ensure nss package is up-to-date
7373
package:
7474
name: nss
7575
state: latest # noqa package-latest
7676
use: "{{ (__certificate_is_ostree | d(false)) |
7777
ternary('ansible.posix.rhel_rpm_ostree', omit) }}"
78-
when: ansible_facts.os_family == "RedHat"
78+
when: ansible_facts["os_family"] == "RedHat"
7979

8080
- name: Sanitize /etc/hosts
8181
ansible.builtin.lineinfile:
8282
path: /etc/hosts
83-
regexp: "{{ ansible_default_ipv4.address }}"
83+
regexp: "{{ ansible_facts['default_ipv4'].address }}"
8484
state: absent
8585
owner: root
8686
group: root
@@ -91,7 +91,7 @@
9191
- name: Add host to /etc/hosts
9292
ansible.builtin.lineinfile:
9393
path: /etc/hosts
94-
line: "{{ ansible_default_ipv4.address }} ipaserver.test.local"
94+
line: "{{ ansible_facts['default_ipv4'].address }} ipaserver.test.local"
9595
state: present
9696
insertafter: EOF
9797
create: true

tests/tests_basic_ipa.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,4 +104,4 @@
104104
hostname:
105105
name: "{{ __saved_hostname.stdout }}"
106106
use: systemd
107-
when: ansible_facts.os_family == "RedHat"
107+
when: ansible_facts["os_family"] == "RedHat"

tests/tests_include_vars_from_parent.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@
3030
# create all variants like CentOS, CentOS_8.1, CentOS-8.1,
3131
# CentOS-8, CentOS-8.1
3232
# more formally:
33-
# {{ ansible_distribution }}-{{ ansible_distribution_version }}
34-
# {{ ansible_distribution }}-{{ ansible_distribution_major_version }}
35-
# {{ ansible_distribution }}
36-
# {{ ansible_os_family }}
33+
# {{ ansible_facts['distribution'] }}-{{ ansible_facts['distribution_version'] }}
34+
# {{ ansible_facts['distribution'] }}-{{ ansible_facts['distribution_major_version'] }}
35+
# {{ ansible_facts['distribution'] }}
36+
# {{ ansible_facts['os_family'] }}
3737
# and the same for _ as separator.
3838
varfiles: "{{ [facts['distribution']] | product(separators) |
3939
map('join') | product(versions) | map('join') | list +

tests/tests_subject_complex.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
- name: Verify certs if not CentOS/RedHat 7
3636
when: |
3737
not (
38-
ansible_distribution in ['CentOS', 'RedHat'] and
39-
ansible_distribution_major_version == "7"
38+
ansible_facts["distribution"] in ['CentOS', 'RedHat'] and
39+
ansible_facts["distribution_major_version"] == "7"
4040
)
4141
block:
4242
- name: Verify each certificate

tests/vars/rh_distros_vars.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ __certificate_rh_distros:
1414
__certificate_rh_distros_fedora: "{{ __certificate_rh_distros + ['Fedora'] }}"
1515

1616
# Use this in conditionals to check if distro is Red Hat or clone
17-
__certificate_is_rh_distro: "{{ ansible_distribution in __certificate_rh_distros }}"
17+
__certificate_is_rh_distro: "{{ ansible_facts['distribution'] in __certificate_rh_distros }}"
1818

1919
# Use this in conditionals to check if distro is Red Hat or clone, or Fedora
20-
__certificate_is_rh_distro_fedora: "{{ ansible_distribution in __certificate_rh_distros_fedora }}"
20+
__certificate_is_rh_distro_fedora: "{{ ansible_facts['distribution'] in __certificate_rh_distros_fedora }}"

vars/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ __certificate_rh_distros:
4848
__certificate_rh_distros_fedora: "{{ __certificate_rh_distros + ['Fedora'] }}"
4949

5050
# Use this in conditionals to check if distro is Red Hat or clone
51-
__certificate_is_rh_distro: "{{ ansible_distribution in __certificate_rh_distros }}"
51+
__certificate_is_rh_distro: "{{ ansible_facts['distribution'] in __certificate_rh_distros }}"
5252

5353
# Use this in conditionals to check if distro is Red Hat or clone, or Fedora
54-
__certificate_is_rh_distro_fedora: "{{ ansible_distribution in __certificate_rh_distros_fedora }}"
54+
__certificate_is_rh_distro_fedora: "{{ ansible_facts['distribution'] in __certificate_rh_distros_fedora }}"
5555
# END - DO NOT EDIT THIS BLOCK - rh distros variables

0 commit comments

Comments
 (0)