Merge pull request #1882 from ceph/multi-journal

osd: drop support for device partition

diff --cc roles/ceph-osd/tasks/scenarios/collocated.yml
index fba11a3f2152a958cf2a815b9d7a709e5fc84957,6398515072a60334cf25fbda7db4f2d8e597ab98..1af1a8d26c56c6a154de80d9db8ff12113bd4564
--- 1/roles/ceph-osd/tasks/scenarios/collocated.yml
--- 2/roles/ceph-osd/tasks/scenarios/collocated.yml
+++ b/roles/ceph-osd/tasks/scenarios/collocated.yml
@@@ -62,8 -59,7 +59,5 @@@
      - "{{ devices }}"
    when:
      - not item.0.get("skipped")
-     - not item.1.get("skipped")
      - item.0.get("rc", 0) != 0
-     - item.1.get("rc", 0) != 0
      - not containerized_deployment
 -
 -- include: ../activate_osds.yml

diff --cc roles/ceph-osd/tasks/scenarios/non-collocated.yml
Simple merge