ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
parent 1b9e2e3021 804b0eef24
commit fccb07d39c
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/ceph-common/templates/ceph.conf.j2
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 log file = {{ rbd_client_log_file }} # must be writable by QEMU and allowed by SELinux or AppArmor
[osd] [osd]
{% if osd_objectstore != 'bluestore' %}
osd mkfs type = {{ osd_mkfs_type }} osd mkfs type = {{ osd_mkfs_type }}
osd mkfs options xfs = {{ osd_mkfs_options_xfs }} osd mkfs options xfs = {{ osd_mkfs_options_xfs }}
osd mount options xfs = {{ osd_mount_options_xfs }} osd mount options xfs = {{ osd_mount_options_xfs }}
osd journal size = {{ journal_size }} osd journal size = {{ journal_size }}
{% endif %}
{% if filestore_xattr_use_omap != None %} {% if filestore_xattr_use_omap != None %}
filestore xattr use omap = {{ filestore_xattr_use_omap }} filestore xattr use omap = {{ filestore_xattr_use_omap }}
{% elif osd_mkfs_type == "ext4" %} {% elif osd_mkfs_type == "ext4" %}