Merge pull request #1607 from SoneraCloud/bluestore-acivation-fix

Bluestore: Omit "osd mkfs type" etc from ceph.conf
pull/1609/head
Sébastien Han 2017-06-14 11:36:35 +02:00 committed by GitHub
commit fccb07d39c
1 changed files with 2 additions and 0 deletions

View File

@ -85,10 +85,12 @@ admin socket = {{ rbd_client_admin_socket_path }}/$cluster-$type.$id.$pid.$cctid
log file = {{ rbd_client_log_file }} # must be writable by QEMU and allowed by SELinux or AppArmor
[osd]
{% if osd_objectstore != 'bluestore' %}
osd mkfs type = {{ osd_mkfs_type }}
osd mkfs options xfs = {{ osd_mkfs_options_xfs }}
osd mount options xfs = {{ osd_mount_options_xfs }}
osd journal size = {{ journal_size }}
{% endif %}
{% if filestore_xattr_use_omap != None %}
filestore xattr use omap = {{ filestore_xattr_use_omap }}
{% elif osd_mkfs_type == "ext4" %}