From: yanyx <yanyx@umcloud.com>
Date: Thu, 13 Jul 2017 13:41:20 +0000 (+0800)
Subject: ceph-osd:  when ceph relase >= luminous add --filestore config
X-Git-Tag: v2.3.0rc2^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7e56b5c53166ce3aa3103859ef4f083c6547ffb7;p=ceph-ansible.git

ceph-osd:  when ceph relase >= luminous add --filestore config
---

diff --git a/roles/ceph-osd/tasks/scenarios/raw_multi_journal.yml b/roles/ceph-osd/tasks/scenarios/raw_multi_journal.yml
index 6f29ed58e..0e700aa6f 100644
--- a/roles/ceph-osd/tasks/scenarios/raw_multi_journal.yml
+++ b/roles/ceph-osd/tasks/scenarios/raw_multi_journal.yml
@@ -7,8 +7,14 @@
 # if you have 64 disks with 4TB each, this will take a while
 # since Ansible will sequential process the loop
 
+- set_fact:
+    osd_type: "--filestore"
+  when: 
+    - ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous
+    - osd_objectstore == 'filestore'
+
 - name: prepare filestore osd disk(s) with a dedicated journal device
-  command: "ceph-disk prepare --cluster {{ cluster }} {{ item.1 }} {{ item.2 }}"
+  command: "ceph-disk prepare {{ osd_type | default('') }} --cluster {{ cluster }} {{ item.1 }} {{ item.2 }}"
   with_together:
     - "{{ parted_results.results }}"
     - "{{ devices }}"