From 6f8d17646c64d8c253bcc3e3383ca150d60391c6 Mon Sep 17 00:00:00 2001 From: Jirayut Nimsaeng Date: Thu, 8 Dec 2016 22:22:01 +0700 Subject: [PATCH] Remove variables that can be override with ceph_conf_overrides --- roles/ceph-common/defaults/main.yml | 3 --- roles/ceph-common/templates/ceph.conf.j2 | 3 --- 2 files changed, 6 deletions(-) diff --git a/roles/ceph-common/defaults/main.yml b/roles/ceph-common/defaults/main.yml index 104e5f76f..1426dc0e3 100644 --- a/roles/ceph-common/defaults/main.yml +++ b/roles/ceph-common/defaults/main.yml @@ -250,7 +250,6 @@ monitor_interface: interface 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 monitor_address_block: false -mon_pg_warn_max_per_osd: 300 ## OSD options # @@ -261,8 +260,6 @@ osd_mkfs_type: xfs osd_mkfs_options_xfs: -f -i size=2048 osd_mount_options_xfs: noatime,largeio,inode64,swalloc 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 # 'osd_mkfs_type' is set to 'ext4'; otherwise it isn't set. This can diff --git a/roles/ceph-common/templates/ceph.conf.j2 b/roles/ceph-common/templates/ceph.conf.j2 index 15776e56b..29c163198 100644 --- a/roles/ceph-common/templates/ceph.conf.j2 +++ b/roles/ceph-common/templates/ceph.conf.j2 @@ -15,9 +15,6 @@ max open files = {{ max_open_files }} {% if common_single_host_mode is defined and common_single_host_mode %} osd crush chooseleaf type = 0 {% 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 #} {% if groups[mon_group_name] is defined %} mon initial members = {% for host in groups[mon_group_name] %}