fix: fix issues with bootable snapshot code

Signed-off-by: Rich Megginson <rmeggins@redhat.com>

Author: richm

tasks/main.yml

@@ -14,22 +14,14 @@
     use: "{{ (__snapshot_is_ostree | d(false)) |
               ternary('ansible.posix.rhel_rpm_ostree', omit) }}"
 
-- name: Get snapm version
-  check_mode: false
-  command: snapm --version
-  changed_when: false
-  register: __snapshot_snapm_version_output
-  # Ignore errors as snapm may not be available
-  ignore_errors: true
+- name: Get package facts
+  package_facts:
+  no_log: "{{ ansible_verbosity < 2 }}"
 
-- name: Set snapm availability fact
+- name: Set snapm availability fact and version
   set_fact:
-    __snapshot_snapm_available: "{{ __snapshot_snapm_version_output is success }}"
-
-- name: Set snapm version
-  set_fact:
-    __snapshot_snapm_version: "{{ __snapshot_snapm_version_output.stdout }}"
-  when: __snapshot_snapm_available
+    __snapshot_snapm_available: "{{ 'snapm' in ansible_facts.packages }}"
+    __snapshot_snapm_version: "{{ ansible_facts.packages.get('snapm', [{}])[0].get('version', '0.0') }}"
 
 # Determine if bootable support is needed
 # If snapshot_lvm_bootable is set to true, or any of the volumes in snapshot_lvm_set

tests/tests_basic_bootable.yml

@@ -129,6 +129,14 @@
           assert:
             that: not snapshot_cmd["changed"]
 
+      rescue:
+        - name: Do not fail if snapm is too old for test
+          assert:
+            that: ansible_failed_result.msg is search(msg1) or ansible_failed_result.msg is search(msg2)
+          vars:
+            msg1: "Package snapm version .* is too old"
+            msg2: "Package snapm version 0.5 or later is required to use bootable snapsets"
+
       always:
         - name: Cleanup
           include_tasks: tasks/cleanup.yml

tests/tests_set_bootable.yml

@@ -99,12 +99,12 @@
           assert:
             that: not snapshot_cmd["changed"]
       rescue:
-        - name: Check if error is due to snapm version too old
-          fail:
-            msg: Unexpected error occurred {{ ansible_failed_result | to_nice_json }}
-          when: not ansible_failed_result.msg is search(err_msg)
+        - name: Do not fail if snapm is too old for test
+          assert:
+            that: ansible_failed_result.msg is search(msg1) or ansible_failed_result.msg is search(msg2)
           vars:
-            err_msg: Package snapm .*version 0.5 or later is required to use bootable snapsets
+            msg1: "Package snapm version .* is too old"
+            msg2: "Package snapm version 0.5 or later is required to use bootable snapsets"
       always:
         - name: Cleanup
           include_tasks: tasks/cleanup.yml