refactor: improve support for ostree systems

The dependency on `ansible.utils.update_fact` is causing issue with
some users who now must install that collection in order to run
the role, even if they do not care about ostree.

The fix is to stop trying to set `ansible_facts.pkg_mgr`, and instead
force the use of the ostree package manager with the `package:` module
`use:` option.  The strategy is - on ostree systems, set the flag
`__$ROLENAME_is_ostree` if the system is an ostree system.  The flag
will either be undefined or `false` on non-ostree systems.
Then, change every invocation of the `package:` module like this:

```yaml
- name: Ensure required packages are present
  package:
    name: "{{ __$ROLENAME_packages }}"
    state: present
    use: "{{ (__$ROLENAME_is_ostree | d(false)) |
      ternary('ansible.posix.rhel_rpm_ostree', omit) }}"
```

This should ensure that the `use:` parameter is not used if the system
is non-ostree.  The goal is to make the ostree support as unobtrusive
as possible for non-ostree systems.
The user can also set `__$ROLENAME_is_ostree: true` in the inventory or play
if the user knows that ostree is being used and wants to skip the check.
Or, the user is concerned about the performance hit for ostree detection
on non-ostree systems, and sets `__$ROLENAME_is_ostree: false` to skip
the check.
The flag `__$ROLENAME_is_ostree` can also be used in the role or tests to
include or exclude tasks from being run on ostree systems.

This fix also improves error reporting in the `get_ostree_data.sh` script
when included roles cannot be found.

Signed-off-by: Rich Megginson <[email protected]>

.ostree/get_ostree_data.sh

@@ -2,7 +2,6 @@
 
 set -euo pipefail
 
-role_collection_dir="${ROLE_COLLECTION_DIR:-fedora/linux_system_roles}"
 ostree_dir="${OSTREE_DIR:-"$(dirname "$(realpath "$0")")"}"
 
 if [ -z "${4:-}" ] || [ "${1:-}" = help ] || [ "${1:-}" = -h ]; then
@@ -29,7 +28,7 @@ if [ "$pkgtype" = testing ]; then
 fi
 
 get_rolepath() {
-    local ostree_dir role rolesdir roles_parent_dir
+    local ostree_dir role rolesdir roles_parent_dir coll_path pth
     ostree_dir="$1"
     role="$2"
     roles_parent_dir="$(dirname "$(dirname "$ostree_dir")")"
@@ -47,16 +46,22 @@ get_rolepath() {
         fi
     done
     # look elsewhere
-    if [ -n "${ANSIBLE_COLLECTIONS_PATHS:-}" ]; then
-        for pth in ${ANSIBLE_COLLECTIONS_PATHS//:/ }; do
-            rolesdir="$pth/ansible_collections/$role_collection_dir/roles/$role/.ostree"
-            if [ -d "$rolesdir" ]; then
-                echo "$rolesdir"
-                return 0
-            fi
+    coll_path="${ANSIBLE_COLLECTIONS_PATH:-}"
+    if [ -z "$coll_path" ]; then
+        coll_path="${ANSIBLE_COLLECTIONS_PATHS:-}"
+    fi
+    if [ -n "${coll_path}" ]; then
+        for pth in ${coll_path//:/ }; do
+            for rolesdir in "$pth"/ansible_collections/*/*_system_roles/roles/"$role"/.ostree; do
+                if [ -d "$rolesdir" ]; then
+                    echo "$rolesdir"
+                    return 0
+                fi
+            done
         done
     fi
-    return 1
+    1>&2 echo ERROR - could not find role "$role" - please use ANSIBLE_COLLECTIONS_PATH
+    exit 2
 }
 
 get_packages() {
@@ -75,6 +80,10 @@ get_packages() {
             roles="$(cat "$rolefile")"
             for role in $roles; do
                 rolepath="$(get_rolepath "$ostree_dir" "$role")"
+                if [ -z "$rolepath" ]; then
+                    1>&2 echo ERROR - could not find role "$role" - please use ANSIBLE_COLLECTIONS_PATH
+                    exit 2
+                fi
                 get_packages "$rolepath"
             done
         fi

meta/collection-requirements.yml

@@ -1,4 +1,3 @@
 ---
 collections:
   - name: ansible.posix
-  - name: ansible.utils

tasks/enable_coprs.yml

@@ -13,6 +13,8 @@
 - name: Make sure COPR support packages are present
   package:
     name: "{{ _storage_copr_support_packages }}"
+    use: "{{ (__storage_is_ostree | d(false)) |
+             ternary('ansible.posix.rhel_rpm_ostree', omit) }}"
   when: install_copr | d(false) | bool
 
 - name: Enable COPRs

tasks/main-blivet.yml

@@ -3,6 +3,8 @@
   package:
     name: "{{ blivet_package_list }}"
     state: present
+    use: "{{ (__storage_is_ostree | d(false)) |
+             ternary('ansible.posix.rhel_rpm_ostree', omit) }}"
   when: storage_skip_checks is not defined or
         not "blivet_available" in storage_skip_checks
 
@@ -40,6 +42,8 @@
   package:
     name: "{{ package_info.packages + extra_pkgs }}"
     state: present
+    use: "{{ (__storage_is_ostree | d(false)) |
+             ternary('ansible.posix.rhel_rpm_ostree', omit) }}"
   when: storage_skip_checks is not defined or
         not "packages_installed" in storage_skip_checks
   vars:

tasks/set_vars.yml

@@ -20,20 +20,14 @@
     __vars_file: "{{ role_path }}/vars/{{ item }}"
   when: __vars_file is file
 
-- name: Ensure correct package manager for ostree systems
-  vars:
-    ostree_pkg_mgr: ansible.posix.rhel_rpm_ostree
-    ostree_booted_file: /run/ostree-booted
-  when: ansible_facts.pkg_mgr | d("") != ostree_pkg_mgr
+- name: Determine if system is ostree and set flag
+  when: not __storage_is_ostree is defined
   block:
     - name: Check if system is ostree
       stat:
-        path: "{{ ostree_booted_file }}"
+        path: /run/ostree-booted
       register: __ostree_booted_stat
 
-    - name: Set package manager to use for ostree
-      ansible.utils.update_fact:
-        updates:
-          - path: ansible_facts.pkg_mgr
-            value: "{{ ostree_pkg_mgr }}"
-      when: __ostree_booted_stat.stat.exists
+    - name: Set flag to indicate system is ostree
+      set_fact:
+        __storage_is_ostree: "{{ __ostree_booted_stat.stat.exists }}"

tests/get_unused_disk.yml

@@ -3,6 +3,8 @@
   package:
     name: "{{ test_packages }}"
     state: present
+    use: "{{ (__storage_is_ostree | d(false)) |
+             ternary('ansible.posix.rhel_rpm_ostree', omit) }}"
   vars:
     # util-linux needed for lsblk, findmnt, etc.
     test_packages: "{{ ['util-linux-core']

tests/test-verify-volume-encryption.yml

@@ -11,6 +11,8 @@
   package:
     name: cryptsetup
     state: present
+    use: "{{ (__storage_is_ostree | d(false)) |
+             ternary('ansible.posix.rhel_rpm_ostree', omit) }}"
 
 - name: Collect LUKS info for this volume
   command: cryptsetup luksDump {{ storage_test_volume._raw_device }}

tests/test-verify-volume-mount.yml

@@ -31,8 +31,7 @@
       storage_test_volume.fs_type == 'swap' else 0 }}"
   vars:
     # assumes /opt which is /var/opt in ostree
-    mount_prefix: "{{ '/var'
-      if ansible_facts.pkg_mgr == 'ansible.posix.rhel_rpm_ostree'
+    mount_prefix: "{{ '/var' if __storage_is_ostree | d(false)
       and storage_test_volume.mount_point
       and storage_test_volume.mount_point.startswith('/opt') else '' }}"
 

tests/tests_luks.yml

@@ -36,6 +36,8 @@
           package:
             name: dracut-fips
             state: present
+            use: "{{ (__storage_is_ostree | d(false)) |
+                     ternary('ansible.posix.rhel_rpm_ostree', omit) }}"
 
         - name: Configure boot for FIPS
           changed_when: false

tests/tests_luks_pool.yml

@@ -39,6 +39,8 @@
           package:
             name: dracut-fips
             state: present
+            use: "{{ (__storage_is_ostree | d(false)) |
+                     ternary('ansible.posix.rhel_rpm_ostree', omit) }}"
 
         - name: Configure boot for FIPS
           changed_when: false

tests/tests_lvm_auto_size_cap.yml

@@ -39,6 +39,8 @@
       package:
         name: bc
         state: present
+        use: "{{ (__storage_is_ostree | d(false)) |
+                 ternary('ansible.posix.rhel_rpm_ostree', omit) }}"
 
     - name: Run bc 2 * {{ test_disk_size }}
       command:

tests/tests_safe_mode_check.yml

@@ -36,9 +36,10 @@
       block:
         - name: Install package
           package:
-            name:
-              - nilfs-utils
+            name: nilfs-utils
             state: present
+            use: "{{ (__storage_is_ostree | d(false)) |
+                     ternary('ansible.posix.rhel_rpm_ostree', omit) }}"
       rescue:
         - name: Set skip rest true
           set_fact:

tests/verify-pool-member-encryption.yml

@@ -13,6 +13,8 @@
   package:
     name: cryptsetup
     state: present
+    use: "{{ (__storage_is_ostree | d(false)) |
+             ternary('ansible.posix.rhel_rpm_ostree', omit) }}"
 
 - name: Collect LUKS info for this member
   command: cryptsetup luksDump {{ _storage_test_member_backing_dev.stdout }}