Merge pull request #8 from richm/richm-add_bootable

feat: some suggested fixes

Author: trgill

README.md

@@ -247,7 +247,7 @@ whose names start with `sql_db_`.  This uses the Python `re.search`.
 
 ### snapshot_lvm_bootable
 
-Boolean - default is unset.  Only supported on operating systems that
+Boolean - default is false.  Only supported on operating systems that
 support snapshot manager (snapm).  When set to true, and passed to the
 'snapshot' command, the snapshot created will have a corresponding boot
 entry.  The boot entry will be removed when the snapset is removed.

defaults/main.yml

@@ -17,3 +17,4 @@ snapshot_lvm_mountpoint: ''
 snapshot_lvm_mount_options: ''
 snapshot_lvm_vg_include: ''
 snapshot_lvm_fstype: ''
+snapshot_lvm_bootable: false

tasks/main.yml

@@ -28,9 +28,17 @@
 
 - name: Set snapm version
   set_fact:
-    __snapshot_snapm_version: "{{ (__snapshot_snapm_version_output.stdout) }}"
-  when:
-    - __snapshot_snapm_available
+    __snapshot_snapm_version: "{{ __snapshot_snapm_version_output.stdout }}"
+  when: __snapshot_snapm_available
+
+# Determine if bootable support is needed
+# If snapshot_lvm_bootable is set to true, or any of the volumes in snapshot_lvm_set
+# have bootable set to true, then bootable support is needed.
+- name: Set needs bootable support
+  set_fact:
+    __snapshot_needs_bootable_support: "{{ snapshot_lvm_bootable or (snapshot_lvm_set |
+      selectattr('bootable', 'defined') |
+      selectattr('bootable') | list | length > 0) }}"
 
 - name: Package snapm version must be 0.4 or later
   fail:
@@ -41,23 +49,24 @@
     - __snapshot_snapm_available
     - __snapshot_snapm_version is version("0.4", "<")
 
-- name: Package snapm required for bootable snapsets
-  fail:
-    msg: >
-      Package snapm is required for bootable snapsets
-  when:
-    - not __snapshot_snapm_available
-    - snapshot_lvm_bootable | d(false)
-
-- name: Package snapm version must be 0.5 or later bootable snapsets
+- name: Package snapm must available and be version 0.5 or later for bootable snapsets
   fail:
     msg: >
       Package snapm version {{ __snapshot_snapm_version }} is too old -
       must be 0.5 or later to use bootable snapsets
   when:
-    - __snapshot_snapm_available
-    - __snapshot_snapm_version is version("0.5", "<")
-    - snapshot_lvm_bootable | d(false)
+    - not __snapshot_snapm_available or
+      __snapshot_snapm_version is version("0.5", "<")
+    - __snapshot_needs_bootable_support
+    - snapshot_fail_if_too_old | d(true)
+
+- name: Package snapm must available and be version 0.5 or later for bootable snapsets
+  meta: end_host
+  when:
+    - not __snapshot_snapm_available or
+      __snapshot_snapm_version is version("0.5", "<")
+    - __snapshot_needs_bootable_support
+    - not snapshot_fail_if_too_old | d(true)
 
 - name: Run snapshot module and handle errors
   when: snapshot_lvm_action is defined

tests/tests_set_bootable.yml

@@ -49,28 +49,14 @@
           vg: test_vg3
           lv: lv7
           percent_space_required: 15
+    snapshot_lvm_bootable: true
+    snapshot_fail_if_too_old: false
   tasks:
     - name: Load test variables
       include_vars:
         file: vars/rh_distros_vars.yml
       when: __snapshot_is_ostree is not defined
 
-    - name: Run the snapshot role to define __snapshot_snapm_available
-      include_role:
-        name: linux-system-roles.snapshot
-
-    - name: Test is only supported on platforms with snapm support
-      debug:
-        msg: >
-          This test is only supported on platforms with snapm support.
-      when:
-          - not __snapshot_snapm_available
-
-    - name: End test
-      meta: end_play
-      when:
-          - not __snapshot_snapm_available
-
     - name: Run tests
       block:
         - name: Setup
@@ -81,7 +67,6 @@
             name: linux-system-roles.snapshot
           vars:
             snapshot_lvm_action: snapshot
-            snapshot_lvm_bootable: true
             snapshot_lvm_set: "{{ snapshot_test_set }}"
 
         - name: Assert changes for create snapset