From 496529cf4bdee0633bca388df1b1cdaa99466f0b Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins@redhat.com>
Date: Wed, 18 Oct 2023 16:22:28 -0600
Subject: [PATCH] feat: support for ostree systems

Feature: Allow running and testing the role with ostree managed nodes.

Reason: We have users who want to use the role to manage ostree
systems.

Result: Users can use the role to manage ostree managed nodes.
Signed-off-by: Rich Megginson <rmeggins@redhat.com>
---
 .ostree/README.md                     |   3 +
 .ostree/get_ostree_data.sh            | 113 ++++++++++++++++++++++++++
 .ostree/packages-runtime-CentOS-7.txt |   2 +
 .ostree/packages-runtime-CentOS-8.txt |   3 +
 .ostree/packages-runtime-CentOS-9.txt |   3 +
 .ostree/packages-runtime-Fedora.txt   |   1 +
 .ostree/packages-runtime-RedHat-7.txt |   2 +
 .ostree/packages-runtime-RedHat-8.txt |   3 +
 .ostree/packages-runtime-RedHat-9.txt |   3 +
 .ostree/packages-runtime.txt          |  10 +++
 .ostree/packages-testing-CentOS-7.txt |   2 +
 .ostree/packages-testing-CentOS-8.txt |   1 +
 .ostree/packages-testing-CentOS-9.txt |   1 +
 .ostree/packages-testing-Fedora.txt   |   2 +
 .ostree/packages-testing-RedHat-7.txt |   2 +
 .ostree/packages-testing-RedHat-8.txt |   1 +
 .ostree/packages-testing-RedHat-9.txt |   1 +
 .ostree/packages-testing.txt          |   2 +
 .sanity-ansible-ignore-2.10.txt       |   1 +
 .sanity-ansible-ignore-2.11.txt       |   1 +
 .sanity-ansible-ignore-2.12.txt       |   1 +
 .sanity-ansible-ignore-2.13.txt       |   1 +
 .sanity-ansible-ignore-2.14.txt       |   1 +
 .sanity-ansible-ignore-2.15.txt       |   1 +
 .sanity-ansible-ignore-2.9.txt        |   1 +
 README-ostree.md                      |  66 +++++++++++++++
 README.md                             |  11 +--
 meta/collection-requirements.yml      |   1 +
 tasks/main-blivet.yml                 |   9 +-
 tasks/set_vars.yml                    |  18 ++++
 tests/get_unused_disk.yml             |  12 +++
 tests/test-verify-volume-mount.yml    |  12 ++-
 32 files changed, 282 insertions(+), 9 deletions(-)
 create mode 100644 .ostree/README.md
 create mode 100755 .ostree/get_ostree_data.sh
 create mode 100644 .ostree/packages-runtime-CentOS-7.txt
 create mode 100644 .ostree/packages-runtime-CentOS-8.txt
 create mode 100644 .ostree/packages-runtime-CentOS-9.txt
 create mode 100644 .ostree/packages-runtime-Fedora.txt
 create mode 100644 .ostree/packages-runtime-RedHat-7.txt
 create mode 100644 .ostree/packages-runtime-RedHat-8.txt
 create mode 100644 .ostree/packages-runtime-RedHat-9.txt
 create mode 100644 .ostree/packages-runtime.txt
 create mode 100644 .ostree/packages-testing-CentOS-7.txt
 create mode 100644 .ostree/packages-testing-CentOS-8.txt
 create mode 100644 .ostree/packages-testing-CentOS-9.txt
 create mode 100644 .ostree/packages-testing-Fedora.txt
 create mode 100644 .ostree/packages-testing-RedHat-7.txt
 create mode 100644 .ostree/packages-testing-RedHat-8.txt
 create mode 100644 .ostree/packages-testing-RedHat-9.txt
 create mode 100644 .ostree/packages-testing.txt
 create mode 100644 README-ostree.md

diff --git a/.ostree/README.md b/.ostree/README.md
new file mode 100644
index 00000000..f5e6931b
--- /dev/null
+++ b/.ostree/README.md
@@ -0,0 +1,3 @@
+*NOTE*: The `*.txt` files are used by `get_ostree_data.sh` to create the lists
+of packages, and to find other system roles used by this role.  DO NOT use them
+directly.
diff --git a/.ostree/get_ostree_data.sh b/.ostree/get_ostree_data.sh
new file mode 100755
index 00000000..d0a03a3d
--- /dev/null
+++ b/.ostree/get_ostree_data.sh
@@ -0,0 +1,113 @@
+#!/bin/bash
+
+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
+    cat <<EOF
+Usage: $0 packages [runtime|testing] DISTRO-MAJOR[.MINOR] [json|yaml|raw|toml]
+The script will use the packages and roles files in $ostree_dir to
+construct the list of packages needed to build the ostree image.  The script
+will output the list of packages in the given format
+- json is a JSON list like ["pkg1","pkg2",....,"pkgN"]
+- yaml is the YAML list format
+- raw is the list of packages, one per line
+- toml is a list of [[packages]] elements as in https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html-single/composing_installing_and_managing_rhel_for_edge_images/index#creating-an-image-builder-blueprint-for-a-rhel-for-edge-image-using-the-command-line-interface_composing-a-rhel-for-edge-image-using-image-builder-command-line
+The DISTRO-MAJOR.MINOR is the same format used by Ansible for distribution e.g. CentOS-8, RedHat-8.9, etc.
+EOF
+    exit 1
+fi
+category="$1"
+pkgtype="$2"
+distro_ver="$3"
+format="$4"
+pkgtypes=("$pkgtype")
+if [ "$pkgtype" = testing ]; then
+    pkgtypes+=(runtime)
+fi
+
+get_rolepath() {
+    local ostree_dir role rolesdir
+    ostree_dir="$1"
+    role="$2"
+    rolesdir="$(dirname "$(dirname "$ostree_dir")")/$role/.ostree"
+    if [ -d "$rolesdir" ]; then
+        echo "$rolesdir"
+        return 0
+    fi
+    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
+        done
+    fi
+    return 1
+}
+
+get_packages() {
+    local ostree_dir pkgtype pkgfile rolefile
+    ostree_dir="$1"
+    for pkgtype in "${pkgtypes[@]}"; do
+        for suff in "" "-$distro" "-${distro}-${major_ver}" "-${distro}-${ver}"; do
+            pkgfile="$ostree_dir/packages-${pkgtype}${suff}.txt"
+            if [ -f "$pkgfile" ]; then
+                cat "$pkgfile"
+            fi
+        done
+        rolefile="$ostree_dir/roles-${pkgtype}.txt"
+        if [ -f "$rolefile" ]; then
+            local roles role rolepath
+            roles="$(cat "$rolefile")"
+            for role in $roles; do
+                rolepath="$(get_rolepath "$ostree_dir" "$role")"
+                get_packages "$rolepath"
+            done
+        fi
+    done | sort -u
+}
+
+format_packages_json() {
+    local comma pkgs pkg
+    comma=""
+    pkgs="["
+    while read -r pkg; do
+        pkgs="${pkgs}${comma}\"${pkg}\""
+        comma=,
+    done
+    pkgs="${pkgs}]"
+    echo "$pkgs"
+}
+
+format_packages_raw() {
+    cat
+}
+
+format_packages_yaml() {
+    while read -r pkg; do
+        echo "- $pkg"
+    done
+}
+
+format_packages_toml() {
+    while read -r pkg; do
+        echo "[[packages]]"
+        echo "name = \"$pkg\""
+        echo "version = \"*\""
+    done
+}
+
+distro="${distro_ver%%-*}"
+ver="${distro_ver##*-}"
+if [[ "$ver" =~ ^([0-9]*) ]]; then
+    major_ver="${BASH_REMATCH[1]}"
+else
+    echo ERROR: cannot parse major version number from version "$ver"
+    exit 1
+fi
+
+"get_$category" "$ostree_dir" | "format_${category}_$format"
diff --git a/.ostree/packages-runtime-CentOS-7.txt b/.ostree/packages-runtime-CentOS-7.txt
new file mode 100644
index 00000000..187e3b2e
--- /dev/null
+++ b/.ostree/packages-runtime-CentOS-7.txt
@@ -0,0 +1,2 @@
+python-blivet3
+python-enum34
diff --git a/.ostree/packages-runtime-CentOS-8.txt b/.ostree/packages-runtime-CentOS-8.txt
new file mode 100644
index 00000000..fb2dccef
--- /dev/null
+++ b/.ostree/packages-runtime-CentOS-8.txt
@@ -0,0 +1,3 @@
+kmod-kvdo
+python3-blivet
+vdo
diff --git a/.ostree/packages-runtime-CentOS-9.txt b/.ostree/packages-runtime-CentOS-9.txt
new file mode 100644
index 00000000..fb2dccef
--- /dev/null
+++ b/.ostree/packages-runtime-CentOS-9.txt
@@ -0,0 +1,3 @@
+kmod-kvdo
+python3-blivet
+vdo
diff --git a/.ostree/packages-runtime-Fedora.txt b/.ostree/packages-runtime-Fedora.txt
new file mode 100644
index 00000000..be38897b
--- /dev/null
+++ b/.ostree/packages-runtime-Fedora.txt
@@ -0,0 +1 @@
+python3-blivet
diff --git a/.ostree/packages-runtime-RedHat-7.txt b/.ostree/packages-runtime-RedHat-7.txt
new file mode 100644
index 00000000..187e3b2e
--- /dev/null
+++ b/.ostree/packages-runtime-RedHat-7.txt
@@ -0,0 +1,2 @@
+python-blivet3
+python-enum34
diff --git a/.ostree/packages-runtime-RedHat-8.txt b/.ostree/packages-runtime-RedHat-8.txt
new file mode 100644
index 00000000..fb2dccef
--- /dev/null
+++ b/.ostree/packages-runtime-RedHat-8.txt
@@ -0,0 +1,3 @@
+kmod-kvdo
+python3-blivet
+vdo
diff --git a/.ostree/packages-runtime-RedHat-9.txt b/.ostree/packages-runtime-RedHat-9.txt
new file mode 100644
index 00000000..fb2dccef
--- /dev/null
+++ b/.ostree/packages-runtime-RedHat-9.txt
@@ -0,0 +1,3 @@
+kmod-kvdo
+python3-blivet
+vdo
diff --git a/.ostree/packages-runtime.txt b/.ostree/packages-runtime.txt
new file mode 100644
index 00000000..6f763673
--- /dev/null
+++ b/.ostree/packages-runtime.txt
@@ -0,0 +1,10 @@
+cryptsetup
+e2fsprogs
+kpartx
+libblockdev-crypto
+libblockdev-dm
+libblockdev-lvm
+libblockdev-mdraid
+libblockdev-swap
+lvm2
+xfsprogs
diff --git a/.ostree/packages-testing-CentOS-7.txt b/.ostree/packages-testing-CentOS-7.txt
new file mode 100644
index 00000000..1f77b638
--- /dev/null
+++ b/.ostree/packages-testing-CentOS-7.txt
@@ -0,0 +1,2 @@
+dracut-fips
+util-linux
diff --git a/.ostree/packages-testing-CentOS-8.txt b/.ostree/packages-testing-CentOS-8.txt
new file mode 100644
index 00000000..c3ac23c4
--- /dev/null
+++ b/.ostree/packages-testing-CentOS-8.txt
@@ -0,0 +1 @@
+util-linux
diff --git a/.ostree/packages-testing-CentOS-9.txt b/.ostree/packages-testing-CentOS-9.txt
new file mode 100644
index 00000000..37010e37
--- /dev/null
+++ b/.ostree/packages-testing-CentOS-9.txt
@@ -0,0 +1 @@
+util-linux-core
diff --git a/.ostree/packages-testing-Fedora.txt b/.ostree/packages-testing-Fedora.txt
new file mode 100644
index 00000000..b6fc1080
--- /dev/null
+++ b/.ostree/packages-testing-Fedora.txt
@@ -0,0 +1,2 @@
+nilfs-utils
+util-linux-core
diff --git a/.ostree/packages-testing-RedHat-7.txt b/.ostree/packages-testing-RedHat-7.txt
new file mode 100644
index 00000000..1f77b638
--- /dev/null
+++ b/.ostree/packages-testing-RedHat-7.txt
@@ -0,0 +1,2 @@
+dracut-fips
+util-linux
diff --git a/.ostree/packages-testing-RedHat-8.txt b/.ostree/packages-testing-RedHat-8.txt
new file mode 100644
index 00000000..c3ac23c4
--- /dev/null
+++ b/.ostree/packages-testing-RedHat-8.txt
@@ -0,0 +1 @@
+util-linux
diff --git a/.ostree/packages-testing-RedHat-9.txt b/.ostree/packages-testing-RedHat-9.txt
new file mode 100644
index 00000000..37010e37
--- /dev/null
+++ b/.ostree/packages-testing-RedHat-9.txt
@@ -0,0 +1 @@
+util-linux-core
diff --git a/.ostree/packages-testing.txt b/.ostree/packages-testing.txt
new file mode 100644
index 00000000..d60a1428
--- /dev/null
+++ b/.ostree/packages-testing.txt
@@ -0,0 +1,2 @@
+bc
+cryptsetup
diff --git a/.sanity-ansible-ignore-2.10.txt b/.sanity-ansible-ignore-2.10.txt
index b791db6d..832180ba 100644
--- a/.sanity-ansible-ignore-2.10.txt
+++ b/.sanity-ansible-ignore-2.10.txt
@@ -25,3 +25,4 @@ tests/storage/scripts/generate_tests.py future-import-boilerplate!skip
 tests/storage/scripts/generate_tests.py shebang!skip
 tests/storage/scripts/post-commit shebang!skip
 tests/storage/scripts/pre-commit shebang!skip
+roles/storage/.ostree/get_ostree_data.sh shebang!skip
diff --git a/.sanity-ansible-ignore-2.11.txt b/.sanity-ansible-ignore-2.11.txt
index 0ea9c17d..2a7911b9 100644
--- a/.sanity-ansible-ignore-2.11.txt
+++ b/.sanity-ansible-ignore-2.11.txt
@@ -26,3 +26,4 @@ tests/storage/scripts/generate_tests.py future-import-boilerplate!skip
 tests/storage/scripts/generate_tests.py shebang!skip
 tests/storage/scripts/post-commit shebang!skip
 tests/storage/scripts/pre-commit shebang!skip
+roles/storage/.ostree/get_ostree_data.sh shebang!skip
diff --git a/.sanity-ansible-ignore-2.12.txt b/.sanity-ansible-ignore-2.12.txt
index 2bbb920f..8dd88b1d 100644
--- a/.sanity-ansible-ignore-2.12.txt
+++ b/.sanity-ansible-ignore-2.12.txt
@@ -41,3 +41,4 @@ plugins/module_utils/storage_lsr/size.py pylint!skip
 tests/storage/scripts/generate_tests.py shebang!skip
 tests/storage/scripts/post-commit shebang!skip
 tests/storage/scripts/pre-commit shebang!skip
+roles/storage/.ostree/get_ostree_data.sh shebang!skip
diff --git a/.sanity-ansible-ignore-2.13.txt b/.sanity-ansible-ignore-2.13.txt
index 2bbb920f..8dd88b1d 100644
--- a/.sanity-ansible-ignore-2.13.txt
+++ b/.sanity-ansible-ignore-2.13.txt
@@ -41,3 +41,4 @@ plugins/module_utils/storage_lsr/size.py pylint!skip
 tests/storage/scripts/generate_tests.py shebang!skip
 tests/storage/scripts/post-commit shebang!skip
 tests/storage/scripts/pre-commit shebang!skip
+roles/storage/.ostree/get_ostree_data.sh shebang!skip
diff --git a/.sanity-ansible-ignore-2.14.txt b/.sanity-ansible-ignore-2.14.txt
index 0e98e9af..e7ae90e4 100644
--- a/.sanity-ansible-ignore-2.14.txt
+++ b/.sanity-ansible-ignore-2.14.txt
@@ -38,3 +38,4 @@ plugins/module_utils/storage_lsr/size.py pylint!skip
 tests/storage/scripts/generate_tests.py shebang!skip
 tests/storage/scripts/post-commit shebang!skip
 tests/storage/scripts/pre-commit shebang!skip
+roles/storage/.ostree/get_ostree_data.sh shebang!skip
diff --git a/.sanity-ansible-ignore-2.15.txt b/.sanity-ansible-ignore-2.15.txt
index 0e98e9af..e7ae90e4 100644
--- a/.sanity-ansible-ignore-2.15.txt
+++ b/.sanity-ansible-ignore-2.15.txt
@@ -38,3 +38,4 @@ plugins/module_utils/storage_lsr/size.py pylint!skip
 tests/storage/scripts/generate_tests.py shebang!skip
 tests/storage/scripts/post-commit shebang!skip
 tests/storage/scripts/pre-commit shebang!skip
+roles/storage/.ostree/get_ostree_data.sh shebang!skip
diff --git a/.sanity-ansible-ignore-2.9.txt b/.sanity-ansible-ignore-2.9.txt
index bc53b484..d59138d7 100644
--- a/.sanity-ansible-ignore-2.9.txt
+++ b/.sanity-ansible-ignore-2.9.txt
@@ -18,3 +18,4 @@ tests/storage/scripts/generate_tests.py future-import-boilerplate!skip
 tests/storage/scripts/generate_tests.py shebang!skip
 tests/storage/scripts/post-commit shebang!skip
 tests/storage/scripts/pre-commit shebang!skip
+roles/storage/.ostree/get_ostree_data.sh shebang!skip
diff --git a/README-ostree.md b/README-ostree.md
new file mode 100644
index 00000000..a9f0185b
--- /dev/null
+++ b/README-ostree.md
@@ -0,0 +1,66 @@
+# rpm-ostree
+
+The role supports running on [rpm-ostree](https://coreos.github.io/rpm-ostree/)
+systems. The primary issue is that the `/usr` filesystem is read-only, and the
+role cannot install packages. Instead, it will just verify that the necessary
+packages and any other `/usr` files are pre-installed. The role will change the
+package manager to one that is compatible with `rpm-ostree` systems.
+
+## Building
+
+To build an ostree image for a particular operating system distribution and
+version, use the script `.ostree/get_ostree_data.sh` to get the list of
+packages. If the role uses other system roles, then the script will include the
+packages for the other roles in the list it outputs.  The list of packages will
+be sorted in alphanumeric order.
+
+Usage:
+
+```bash
+.ostree/get_ostree_data.sh packages runtime DISTRO-VERSION FORMAT
+```
+
+`DISTRO-VERSION` is in the format that Ansible uses for `ansible_distribution`
+and `ansible_distribution_version` - for example, `Fedora-38`, `CentOS-8`,
+`RedHat-9.4`
+
+`FORMAT` is one of `toml`, `json`, `yaml`, `raw`
+
+* `toml` - each package in a TOML `[[packages]]` element
+
+```toml
+[[packages]]
+name = "package-a"
+version = "*"
+[[packages]]
+name = "package-b"
+version = "*"
+...
+```
+
+* `yaml` - a YAML list of packages
+
+```yaml
+- package-a
+- package-b
+...
+```
+
+* `json` - a JSON list of packages
+
+```json
+["package-a","package-b",...]
+```
+
+* `raw` - a plain text list of packages, one per line
+
+```bash
+package-a
+package-b
+...
+```
+
+What format you choose depends on which image builder you are using.  For
+example, if you are using something based on
+[osbuild-composer](https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html-single/composing_installing_and_managing_rhel_for_edge_images/index#creating-an-image-builder-blueprint-for-a-rhel-for-edge-image-using-the-command-line-interface_composing-a-rhel-for-edge-image-using-image-builder-command-line),
+you will probably want to use the `toml` output format.
diff --git a/README.md b/README.md
index e85817a2..923bfd34 100644
--- a/README.md
+++ b/README.md
@@ -15,16 +15,13 @@ See below
 
 ### Collection requirements
 
-The role requires the `mount` module from `ansible.posix`.  If you are using
-`ansible-core`, you must install the `ansible.posix` collection.
+The role requires external collections.  Use the following command to install
+them:
 
 ```bash
 ansible-galaxy collection install -vv -r meta/collection-requirements.yml
 ```
 
-If you are using Ansible Engine 2.9, or are using an Ansible bundle which
-includes these collections/modules, you should have to do nothing.
-
 ## Role Variables
 
 __NOTE__: Beginning with version 1.3.0, unspecified parameters are interpreted
@@ -358,6 +355,10 @@ platforms with "buggy" udev.
 
 ```
 
+## rpm-ostree
+
+See README-ostree.md
+
 ## License
 
 MIT
diff --git a/meta/collection-requirements.yml b/meta/collection-requirements.yml
index a0cd255e..9ddec214 100644
--- a/meta/collection-requirements.yml
+++ b/meta/collection-requirements.yml
@@ -1,3 +1,4 @@
 ---
 collections:
   - name: ansible.posix
+  - name: ansible.utils
diff --git a/tasks/main-blivet.yml b/tasks/main-blivet.yml
index fd0d60d4..d4fedd0c 100644
--- a/tasks/main-blivet.yml
+++ b/tasks/main-blivet.yml
@@ -38,10 +38,17 @@
 
 - name: Make sure required packages are installed
   package:
-    name: "{{ package_info.packages }}"
+    name: "{{ package_info.packages + extra_pkgs }}"
     state: present
   when: storage_skip_checks is not defined or
         not "packages_installed" in storage_skip_checks
+  vars:
+    # for some reason the blivet module does not pick up on the
+    # kpartx dependency, and I'm not sure from the role parameters
+    # how to know if kpartx is needed - so maybe this can be moved
+    # into blivet, or made conditional
+    extra_pkgs:
+      - kpartx
 
 - name: Get service facts
   service_facts:
diff --git a/tasks/set_vars.yml b/tasks/set_vars.yml
index e66b0f27..99ee4e19 100644
--- a/tasks/set_vars.yml
+++ b/tasks/set_vars.yml
@@ -19,3 +19,21 @@
   vars:
     __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
+  block:
+    - name: Check if system is ostree
+      stat:
+        path: "{{ ostree_booted_file }}"
+      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
diff --git a/tests/get_unused_disk.yml b/tests/get_unused_disk.yml
index 7fe2ea7d..45a850cc 100644
--- a/tests/get_unused_disk.yml
+++ b/tests/get_unused_disk.yml
@@ -1,4 +1,16 @@
 ---
+- name: Ensure test packages
+  package:
+    name: "{{ test_packages }}"
+    state: present
+  vars:
+    # util-linux needed for lsblk, findmnt, etc.
+    test_packages: "{{ ['util-linux-core']
+      if (ansible_facts['os_family'] == 'RedHat' and
+          ansible_facts['distribution_major_version'] is version('8', '>'))
+      else ['util-linux'] if ansible_facts['os_family'] == 'RedHat'
+      else ['util-linux'] }}"
+
 - name: Find unused disks in the system
   find_unused_disk:
     min_size: "{{ min_size | d(omit) }}"
diff --git a/tests/test-verify-volume-mount.yml b/tests/test-verify-volume-mount.yml
index 0a2dfe90..33913cd7 100644
--- a/tests/test-verify-volume-mount.yml
+++ b/tests/test-verify-volume-mount.yml
@@ -19,9 +19,9 @@
       selectattr('device', 'match', '^' ~ storage_test_device_path ~ '$') |
       list }}"
     storage_test_mount_point_matches: "{{ ansible_mounts |
-      selectattr('mount',
-                 'match', '^' ~ storage_test_volume.mount_point ~ '$') |
-      list }}"
+      selectattr('mount', 'match',
+                 '^' ~ mount_prefix ~ storage_test_volume.mount_point ~ '$') |
+      list if storage_test_volume.mount_point else [] }}"
     storage_test_mount_expected_match_count: "{{ 1
       if _storage_test_volume_present and storage_test_volume.mount_point and
       storage_test_volume.mount_point.startswith('/')
@@ -29,6 +29,12 @@
     storage_test_swap_expected_matches: "{{ 1 if
       _storage_test_volume_present and
       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'
+      and storage_test_volume.mount_point
+      and storage_test_volume.mount_point.startswith('/opt') else '' }}"
 
 - name: Get information about the mountpoint directory
   stat: