Skip to content

Commit c37bf05

Browse files
committed
fail the role
1 parent 1d2e0e2 commit c37bf05

File tree

2 files changed

+21
-13
lines changed

2 files changed

+21
-13
lines changed

tasks/main.yml

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,34 +42,36 @@
4242

4343
- name: Package snapm version must be 0.4 or later
4444
fail:
45-
msg: >
45+
msg: >-
4646
Package snapm version {{ __snapshot_snapm_version }} is too old -
4747
must be 0.4 or later
4848
when:
4949
- __snapshot_snapm_available
5050
- __snapshot_snapm_version is version("0.4", "<")
5151

52-
- name: Package snapm must available and be version 0.5 or later for bootable snapsets
52+
- name: Package snapm must available for bootable snapsets
5353
fail:
54-
msg: >
55-
Package snapm version {{ __snapshot_snapm_version }} is too old -
56-
must be 0.5 or later to use bootable snapsets
54+
msg: >-
55+
Package snapm version 0.5 or later is required to use bootable snapsets
5756
when:
58-
- not __snapshot_snapm_available or
59-
__snapshot_snapm_version is version("0.5", "<")
57+
- not __snapshot_snapm_available
6058
- __snapshot_needs_bootable_support
61-
- snapshot_fail_if_too_old | d(true)
6259

63-
- name: Package snapm must available and be version 0.5 or later for bootable snapsets
64-
meta: end_host
60+
- name: Package snapm must be version 0.5 or later for bootable snapsets
61+
fail:
62+
msg: >-
63+
Package snapm version {{ __snapshot_snapm_version }} is too old -
64+
version 0.5 or later is required to use bootable snapsets
6565
when:
6666
- not __snapshot_snapm_available or
6767
__snapshot_snapm_version is version("0.5", "<")
6868
- __snapshot_needs_bootable_support
69-
- not snapshot_fail_if_too_old | d(true)
7069

7170
- name: Run snapshot module and handle errors
72-
when: snapshot_lvm_action is defined
71+
when:
72+
- snapshot_lvm_action is defined
73+
- not __snapshot_needs_bootable_support or (__snapshot_snapm_available and
74+
__snapshot_snapm_version is version("0.5", ">="))
7375
block:
7476
- name: Run snapshot module {{ snapshot_lvm_action }}
7577
snapshot:

tests/tests_set_bootable.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
lv: lv7
5151
percent_space_required: 15
5252
snapshot_lvm_bootable: true
53-
snapshot_fail_if_too_old: false
5453
tasks:
5554
- name: Load test variables
5655
include_vars:
@@ -121,6 +120,13 @@
121120
- name: Assert no changes for remove snapset
122121
assert:
123122
that: not snapshot_cmd["changed"]
123+
rescue:
124+
- name: Check if error is due to snapm version too old
125+
fail:
126+
msg: Unexpected error occurred {{ ansible_failed_result | to_nice_json }}
127+
when: not ansible_failed_result.msg is search(err_msg)
128+
vars:
129+
err_msg: Package snapm .*version 0.5 or later is required to use bootable snapsets
124130
always:
125131
- name: Cleanup
126132
include_tasks: tasks/cleanup.yml

0 commit comments

Comments
 (0)