From: Sébastien Han <seb@redhat.com>
Date: Wed, 20 Sep 2017 16:14:23 +0000 (+0200)
Subject: config: no not generate osd section if bluestore
X-Git-Tag: v3.0.0rc11~13^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=a4baed1025213b402155d9cba1a9330be03fb3c8;p=ceph-ansible.git

config: no not generate osd section if bluestore

This section is not needed when running a bluestore osd.

Signed-off-by: Sébastien Han <seb@redhat.com>
---

diff --git a/roles/ceph-config/templates/ceph.conf.j2 b/roles/ceph-config/templates/ceph.conf.j2
index af3f64835..b64a3111b 100644
--- a/roles/ceph-config/templates/ceph.conf.j2
+++ b/roles/ceph-config/templates/ceph.conf.j2
@@ -116,6 +116,7 @@ log file = {{ rbd_client_log_file }} # must be writable by QEMU and allowed by S
 {% endif %}
 
 {% if inventory_hostname in groups.get(osd_group_name, []) %}
+{% if osd_objectstore == 'filestore' %}
 [osd]
 osd mkfs type = {{ osd_mkfs_type }}
 osd mkfs options xfs = {{ osd_mkfs_options_xfs }}
@@ -128,6 +129,7 @@ filestore xattr use omap = true
 {# else, default is false #}
 {% endif %}
 {% endif %}
+{% endif %}
 
 {% if groups[mds_group_name] is defined %}
 {% if mds_group_name in group_names %}