Merge pull request #837 from ceph/rhbz-1342117

Do not ignore ceph-disk issues

roles/ceph-osd/tasks/scenarios/bluestore.yml

@@ -11,7 +11,6 @@
 # failed, this is why we check if the device is a partition too.
 - name: automatic prepare osd disk(s) without partitions
   command: ceph-disk prepare --bluestore --cluster "{{ cluster }}" "/dev/{{ item.key }}"
-  ignore_errors: true
   register: prepared_osds
   with_dict: ansible_devices
   when:
@@ -23,7 +22,6 @@
 
 - name: manually prepare osd disk(s)
   command: ceph-disk prepare --bluestore --cluster "{{ cluster }}" "{{ item.2 }}"
-  ignore_errors: true
   with_together:
     - combined_parted_results.results
     - combined_ispartition_results.results

roles/ceph-osd/tasks/scenarios/journal_collocation.yml

@@ -11,7 +11,6 @@
 # failed, this is why we check if the device is a partition too.
 - name: automatic prepare osd disk(s) without partitions
   command: ceph-disk prepare --cluster "{{ cluster }}" "/dev/{{ item.key }}"
-  ignore_errors: true
   register: prepared_osds
   with_dict: ansible_devices
   when:
@@ -23,7 +22,6 @@
 
 - name: manually prepare osd disk(s)
   command: "ceph-disk prepare --cluster {{ cluster }} {{ item.2 }}"
-  ignore_errors: true
   with_together:
     - combined_parted_results.results
     - combined_ispartition_results.results

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")
     - not item.1.get("skipped")
@@ -27,13 +25,4 @@
     - raw_multi_journal
     - 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