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 <[email protected]>

Author: richm

tasks/enable_copr.yml

@@ -2,13 +2,13 @@
 - name: Get list of COPRs
   shell: |
     set -euo pipefail
-    {{ ansible_pkg_mgr }} repolist | \
+    {{ ansible_facts['pkg_mgr'] }} repolist | \
     grep -c `echo {{ repo.repository }} | tr / :` || true
   register: copr_present
   changed_when: false
 
 - name: Enable COPRs
   command:
-    cmd: "{{ ansible_pkg_mgr }} -y copr enable {{ repo.repository }}"
+    cmd: "{{ ansible_facts['pkg_mgr'] }} -y copr enable {{ repo.repository }}"
   when: copr_present.stdout == "0"
   changed_when: true

tests/test-verify-pool-members.yml

@@ -1,7 +1,7 @@
 ---
 - name: Set test variables
   set_fact:
-    _storage_test_pool_pvs_lvm: "{{ ansible_lvm.pvs | dict2items |
+    _storage_test_pool_pvs_lvm: "{{ ansible_facts['lvm'].pvs | dict2items |
       selectattr('value.vg', 'match', '^' ~ storage_test_pool.name ~ '$') |
       map(attribute='key') | list }}"
     _storage_test_expected_pv_count: "{{ 0
@@ -79,7 +79,7 @@
     scripts/does_library_support.py
     blivet.formats.lvmpv.LVMPhysicalVolume.grow_to_fill
   args:
-    executable: "{{ ansible_python.executable }}"
+    executable: "{{ ansible_facts['python'].executable }}"
   register: grow_supported
   changed_when: false
   failed_when: grow_supported.rc not in [0, 1]

tests/test-verify-volume-size.yml

@@ -31,7 +31,7 @@
 
 - name: Get the size of parent/pool device
   bsize:
-    size: "{{ ansible_lvm.vgs[storage_test_pool.name].size_g + 'G' }}"
+    size: "{{ ansible_facts['lvm'].vgs[storage_test_pool.name].size_g + 'G' }}"
   register: storage_test_pool_size
   when:
     - _storage_test_volume_present | bool

tests/tests_change_disk_fs.yml

@@ -7,8 +7,8 @@
     mount_location: '/opt/test'
     volume_size: '5g'
     fs_type_after: "{{ 'ext3'
-      if (ansible_distribution == 'RedHat' and
-          ansible_distribution_major_version == '6')
+      if (ansible_facts['distribution'] == 'RedHat' and
+          ansible_facts['distribution_major_version'] == '6')
       else 'ext4' }}"
   tasks:
     - name: Run the role

tests/tests_change_fs.yml

@@ -6,8 +6,8 @@
     storage_safe_mode: false
     mount_location: '/opt/test1'
     volume_size: '5g'
-    fs_after: "{{ (ansible_distribution == 'RedHat' and
-                   ansible_distribution_major_version == '6') |
+    fs_after: "{{ (ansible_facts['distribution'] == 'RedHat' and
+                   ansible_facts['distribution_major_version'] == '6') |
                   ternary('ext4', 'xfs') }}"
   tags:
     - tests::lvm

tests/tests_change_fs_use_partitions.yml

@@ -8,8 +8,8 @@
     mount_location: '/opt/test1'
     volume_size: '5g'
     fs_type_after: "{{ 'ext3'
-      if (ansible_distribution == 'RedHat' and
-          ansible_distribution_major_version == '6')
+      if (ansible_facts['distribution'] == 'RedHat' and
+          ansible_facts['distribution_major_version'] == '6')
       else 'ext4' }}"
   tags:
     - tests::lvm

tests/tests_create_lv_size_equal_to_vg.yml

@@ -7,7 +7,7 @@
     mount_location: '/opt/test1'
     volume_group_size: '10g'
     lv_size: '10g'
-    unused_disk_subfact: '{{ ansible_devices[unused_disks[0]] }}'
+    unused_disk_subfact: '{{ ansible_facts["devices"][unused_disks[0]] }}'
     disk_size: '{{ unused_disk_subfact.sectors | int * 512 }}'
   tags:
     - tests::lvm

tests/tests_create_thinp_then_remove.yml

@@ -10,8 +10,8 @@
     mount_location3: '/opt/test3'
     volume1_size: '3g'
     volume2_size: '4g'
-    fs_after: "{{ (ansible_distribution == 'RedHat' and
-                   ansible_distribution_major_version == '6') |
+    fs_after: "{{ (ansible_facts['distribution'] == 'RedHat' and
+                   ansible_facts['distribution_major_version'] == '6') |
       ternary('ext4', 'xfs') }}"
 
   tasks:

tests/tests_include_vars_from_parent.yml

@@ -30,10 +30,10 @@
         # create all variants like CentOS, CentOS_8.1, CentOS-8.1,
         # CentOS-8, CentOS-8.1
         # more formally:
-        # {{ ansible_distribution }}-{{ ansible_distribution_version }}
-        # {{ ansible_distribution }}-{{ ansible_distribution_major_version }}
-        # {{ ansible_distribution }}
-        # {{ ansible_os_family }}
+        # {{ ansible_facts['distribution'] }}-{{ ansible_facts['distribution_version'] }}
+        # {{ ansible_facts['distribution'] }}-{{ ansible_facts['distribution_major_version'] }}
+        # {{ ansible_facts['distribution'] }}
+        # {{ ansible_facts['os_family'] }}
         # and the same for _ as separator.
         varfiles: "{{ [facts['distribution']] | product(separators) |
           map('join') | product(versions) | map('join') | list +

tests/tests_lvm_errors.yml

@@ -11,7 +11,7 @@
     invalid_disks:
       - '/non/existent/disk'
     invalid_size: 'xyz GiB'
-    unused_disk_subfact: '{{ ansible_devices[unused_disks[0]] }}'
+    unused_disk_subfact: '{{ ansible_facts["devices"][unused_disks[0]] }}'
   tags:
     - tests::lvm
   tasks: