From: Alfredo Deza <adeza@redhat.com>
Date: Thu, 2 Jun 2016 21:16:21 +0000 (-0400)
Subject: ceph-osd: do not ignore ceph-disk errors in raw multi journal
X-Git-Tag: ceph-ansible-1.0.5-33~20
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=54bd66bd1e9bda0d1b7aa1fc34158cedd460c7e9;p=ceph-ansible.git

ceph-osd: do not ignore ceph-disk errors in raw multi journal

Signed-off-by: Alfredo Deza <adeza@redhat.com>

Resolves: rhbz#1342117
---

diff --git a/roles/ceph-osd/tasks/scenarios/raw_multi_journal.yml b/roles/ceph-osd/tasks/scenarios/raw_multi_journal.yml
index 788bd84a1..91b23e54d 100644
--- a/roles/ceph-osd/tasks/scenarios/raw_multi_journal.yml
+++ b/roles/ceph-osd/tasks/scenarios/raw_multi_journal.yml
@@ -17,8 +17,6 @@
     - devices
     - raw_journal_devices
   changed_when: false
-  ignore_errors: true
-  register: prepare_osd_disk
   when:
     not item.0.get("skipped") and
     not item.1.get("skipped") and
@@ -27,13 +25,4 @@
     raw_multi_journal and
     not osd_auto_discovery
 
-- name: fail if ceph-disk cannot prepare an OSD
-  fail:
-    msg: "ceph-disk failed to prepare an OSD"
-  when:
-    - " 'ceph-disk: Error:' in item.get('stderr', '') "
-    - " 'Failed to add' in item.get('stderr', '') "
-    - item.get("rc") != 0
-  with_items: "{{prepare_osd_disk.results}}"
-
 - include: ../activate_osds.yml