Merge pull request #665 from PiotrProkop/ceph-osd-kv

Adding support for non atomic and non CoreOS machines for deploying containerized osds with kv backend

diff --cc roles/ceph-osd/tasks/main.yml
index cfad81e96ec358e486fd53dff8644f7d1bb4bc10,9f4f4d887fc7334dcbc29a279700513ba89e029b..598b934d1153a5dbb6fbf28b35eef381193a1186
--- 1/roles/ceph-osd/tasks/main.yml
--- 2/roles/ceph-osd/tasks/main.yml
+++ b/roles/ceph-osd/tasks/main.yml
@@@ -3,18 -3,19 +3,24 @@@
    when: not osd_containerized_deployment
  
  - include: ./scenarios/journal_collocation.yml
-   when: journal_collocation and not osd_containerized_deployment
+   when:
+     journal_collocation and
+     not osd_containerized_deployment
  
  - include: ./scenarios/raw_multi_journal.yml
-   when: raw_multi_journal and not osd_containerized_deployment
+   when:
+     raw_multi_journal and
+     not osd_containerized_deployment
  
  - include: ./scenarios/osd_directory.yml
-   when: osd_directory and not osd_containerized_deployment
+   when:
+     osd_directory and
+     not osd_containerized_deployment
  
 +- include: ./scenarios/bluestore.yml
 +  when:
 +    osd_objectstore == 'bluestore' and
 +    not osd_containerized_deployment
 +
  - include: ./docker/main.yml
    when: osd_containerized_deployment