Merged with Upstream Master

diff --cc roles/ceph-osd/tasks/activate_osds.yml
Simple merge

diff --cc roles/ceph-osd/tasks/main.yml
index c5769f1bb4b4682875b81a1658e0971806879644,4550816b6f4daa547b40f9dee9839356292c647d..94a9d5810cb328c7771823123f151d4195d01aac
--- 1/roles/ceph-osd/tasks/main.yml
--- 2/roles/ceph-osd/tasks/main.yml
+++ b/roles/ceph-osd/tasks/main.yml
@@@ -29,15 -21,11 +29,15 @@@
    when:
      - osd_objectstore == 'bluestore'
      - not osd_containerized_deployment
 +  # Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
 +  static: False
  
- - include: ./scenarios/dmcrypt-journal-colocation.yml
+ - include: ./scenarios/dmcrypt-journal-collocation.yml
    when:
-     - dmcrypt_journal_colocation
+     - dmcrypt_journal_collocation
      - not osd_containerized_deployment
 +  # Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
 +  static: False
  
  - include: ./scenarios/dmcrypt-dedicated-journal.yml
    when:

diff --cc roles/ceph-osd/tasks/scenarios/dmcrypt-journal-collocation.yml
index 0000000000000000000000000000000000000000,91057b5aa72cf214b25e468995d5e957b7ab04c5..642f193fbb50e77ddbda4fa8c9c6bccd50d0f953
mode 000000,100644..100644
--- /dev/null
--- 2/roles/ceph-osd/tasks/scenarios/dmcrypt-journal-collocation.yml
+++ b/roles/ceph-osd/tasks/scenarios/dmcrypt-journal-collocation.yml
@@@ -1,0 -1,36 +1,36 @@@
 -    - combined_parted_results.results
 -    - combined_ispartition_results.results
+ ---
+ ## SCENARIO 5: DMCRYPT
+ 
+ - include: ../check_devices.yml
+ 
+ # NOTE (leseb): the prepare process must be parallelized somehow...
+ # if you have 64 disks with 4TB each, this will take a while
+ # since Ansible will sequential process the loop
+ 
+ # NOTE (alahouze): if the device is a partition, the parted command below has
+ # failed, this is why we check if the device is a partition too.
+ - name: automatic prepare osd disk(s) without partitions (dmcrypt)
+   command: ceph-disk prepare --dmcrypt --cluster "{{ cluster }}" "/dev/{{ item.key }}"
+   with_dict: ansible_devices
+   when:
+     - ansible_devices is defined
+     - item.value.removable == "0"
+     - item.value.partitions|count == 0
+     - dmcrypt_journal_collocation
+     - osd_auto_discovery
+ 
+ - name: manually prepare osd disk(s) (dmcrypt)
+   command: ceph-disk prepare --dmcrypt --cluster "{{ cluster }}" "{{ item.2 }}"
+   with_together:
++    - parted_results.results
++    - ispartition_results.results
+     - devices
+   when:
+     - not item.0.get("skipped")
+     - not item.1.get("skipped")
+     - item.0.get("rc", 0) != 0
+     - item.1.get("rc", 0) != 0
+     - dmcrypt_journal_collocation
+     - not osd_auto_discovery
+ 
+ - include: ../activate_osds.yml