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

Remove variables that can be override with ceph_conf_overrides

pull/1165/head
Jirayut Nimsaeng 2016-12-08 22:22:01 +07:00
parent fe9d1163fe
commit 6f8d17646c
2 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
roles/ceph-common/defaults/main.yml
View File

@ -250,7 +250,6 @@ monitor_interface: interface
monitor_address: 0.0.0.0 monitor_address: 0.0.0.0
mon_use_fqdn: false # if set to true, the MON name used will be the fqdn in the ceph.conf mon_use_fqdn: false # if set to true, the MON name used will be the fqdn in the ceph.conf
monitor_address_block: false monitor_address_block: false
mon_pg_warn_max_per_osd: 300
## OSD options ## OSD options
# #
@ -261,8 +260,6 @@ osd_mkfs_type: xfs
osd_mkfs_options_xfs: -f -i size=2048 osd_mkfs_options_xfs: -f -i size=2048
osd_mount_options_xfs: noatime,largeio,inode64,swalloc osd_mount_options_xfs: noatime,largeio,inode64,swalloc
osd_objectstore: filestore osd_objectstore: filestore
osd_pool_default_size: 3
osd_pool_default_min_size: 2
# xattrs. by default, 'filestore xattr use omap' is set to 'true' if # xattrs. by default, 'filestore xattr use omap' is set to 'true' if
# 'osd_mkfs_type' is set to 'ext4'; otherwise it isn't set. This can # 'osd_mkfs_type' is set to 'ext4'; otherwise it isn't set. This can

3
roles/ceph-common/templates/ceph.conf.j2
View File

@ -15,9 +15,6 @@ max open files = {{ max_open_files }}
{% if common_single_host_mode is defined and common_single_host_mode %} {% if common_single_host_mode is defined and common_single_host_mode %}
osd crush chooseleaf type = 0 osd crush chooseleaf type = 0
{% endif %} {% endif %}
mon pg warn max per osd = {{ mon_pg_warn_max_per_osd }}
osd pool default size = {{ osd_pool_default_size }}
osd pool default min size = {{ osd_pool_default_min_size }}
{# NOTE (leseb): the blank lines in-between are needed otherwise we won't get any line break #} {# NOTE (leseb): the blank lines in-between are needed otherwise we won't get any line break #}
{% if groups[mon_group_name] is defined %} {% if groups[mon_group_name] is defined %}
mon initial members = {% for host in groups[mon_group_name] %} mon initial members = {% for host in groups[mon_group_name] %}