From: Leseb <seb@redhat.com>
Date: Fri, 1 Apr 2016 11:16:22 +0000 (+0200)
Subject: Merge pull request #665 from PiotrProkop/ceph-osd-kv
X-Git-Tag: v1.0.4~24
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=9f2556315f8009c2aa5926414efccd91a91b8522;p=ceph-ansible.git

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
---

9f2556315f8009c2aa5926414efccd91a91b8522
diff --cc roles/ceph-osd/tasks/main.yml
index cfad81e96,9f4f4d887..598b934d1
--- a/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