From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Fri, 7 Jun 2019 08:50:28 +0000 (+0200)
Subject: validate: fail in check_devices at the right task
X-Git-Tag: v3.2.17
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=db90debcc7fcb9b8d7f7207fac73c5ee76e053be;p=ceph-ansible.git

validate: fail in check_devices at the right task

see https://bugzilla.redhat.com/show_bug.cgi?id=1648168#c17 for details.

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1648168#c17

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 771648304d7d867e053f8b8fe3ce5b36e061f100)
---

diff --git a/roles/ceph-validate/tasks/check_devices.yml b/roles/ceph-validate/tasks/check_devices.yml
index a8122021c..f709379a2 100644
--- a/roles/ceph-validate/tasks/check_devices.yml
+++ b/roles/ceph-validate/tasks/check_devices.yml
@@ -1,27 +1,28 @@
 ---
 - name: devices validation
   block:
-    - name: validate devices is actually a device
+    - name: get devices information
       parted:
         device: "{{ item }}"
         unit: MiB
       register: devices_parted
+      failed_when: False
       with_items: "{{ devices }}"
 
     - name: fail if one of the devices is not a device
       fail:
         msg: "{{ item }} is not a block special file!"
-      when:
-        - item.failed
+      when: item.rc is defined
       with_items: "{{ devices_parted.results }}"
   when:
     - devices is defined
 
-- name: validate dedicated_device is/are actually device(s)
+- name: get dedicated_device information
   parted:
     device: "{{ item }}"
     unit: MiB
   register: dedicated_device_parted
+  failed_when: False
   with_items: "{{ dedicated_devices }}"
   when:
     - osd_scenario == 'non-collocated'
@@ -32,7 +33,7 @@
   with_items: "{{ dedicated_device_parted.results }}"
   when:
     - osd_scenario == 'non-collocated'
-    - item.failed
+    - item.rc is defined
 
 - name: fail if number of dedicated_devices is not equal to number of devices
   fail: