Merge pull request #57 from yontalcar/tests_get_disks

Fail if there are not enough disks for testing

Author: pcahyna

tests/get_unused_disk.yml

@@ -9,12 +9,10 @@
     unused_disks: "{{ unused_disks_return.disks }}"
   when: "'Unable to find unused disk' not in unused_disks_return.disks"
 
-- block:
-    - name: Exit playbook when there's no unused disks in the system
-      debug:
-        msg: "Unable to find unused disks. Exiting playbook."
-    - meta: end_play
-  when: unused_disks is undefined
+- name: Exit playbook when there's not enough unused disks in the system
+  fail:
+    msg: "Unable to find enough unused disks. Exiting playbook."
+  when: unused_disks is undefined or unused_disks|length < disks_needed|default(1)
 
 - name: Print unused disks
   debug:

tests/tests_lvm_multiple_disks_multiple_volumes.yml

@@ -15,13 +15,7 @@
       vars:
         min_size: "{{ volume_group_size }}"
         max_return: 2
-
-    - block:
-        - debug:
-            msg: "There needs to be two unused disks in the system to run this playbook."
-        - name: End playbook if there isn't two disks available
-          meta: end_play
-      when: unused_disks|length < 2
+        disks_needed: 2
 
     - name: Create a logical volume spanning two physical volumes that changes its mount location
       include_role: