diff options
| author |   Keith Schincke <keith.schincke@gmail.com> | 2017-05-12 08:12:56 -0400 |
|---|---|---|
| committer | Keith Schincke <keith.schincke@gmail.com> | 2017-05-22 14:38:52 -0400 |
| commit | cdfe03566354b938e94c6863b0d4b1c3e64cc10c (patch) | |
| tree | acec9be2315c3819240d525afccf423b6c615d5c /puppet | |
| parent | 340dfd4d2f2add386ac92e222023988a529ad96f (diff) | |
Remove osd_pool_default_min_size to allow Ceph cluster to do the right thing by default
The default value is 0 which has the minimum number be caluclated based on the replica count
from osd_pool_defaut_size. The default replica count is 3 and the calculated min_size is 2.
If the replica count is 1 then the min_size is 1. ie: min_size = replica - (replica/2)
Add CephPoolDefaultSize parameter to ceph-mon.yaml. This parameter defaults to 3 but can
be overriden. See puppet-ceph-devel.yaml for an example
Change-Id: Ie9bdd9b16bcb9f11107ece614b010e87d3ae98a9
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/services/ceph-base.yaml | 1 | ||||
| -rw-r--r-- | puppet/services/ceph-mon.yaml | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/puppet/services/ceph-base.yaml b/puppet/services/ceph-base.yaml index 033d3f77..1eea3dc7 100644 --- a/puppet/services/ceph-base.yaml +++ b/puppet/services/ceph-base.yaml @@ -91,7 +91,6 @@ outputs: service_name: ceph_base config_settings: tripleo::profile::base::ceph::enable_ceph_storage: {get_param: ControllerEnableCephStorage} - ceph::profile::params::osd_pool_default_min_size: 1 ceph::profile::params::osds: {/srv/data: {}} ceph::profile::params::manage_repo: false ceph::profile::params::authentication_type: cephx diff --git a/puppet/services/ceph-mon.yaml b/puppet/services/ceph-mon.yaml index d589ef89..0f72eb73 100644 --- a/puppet/services/ceph-mon.yaml +++ b/puppet/services/ceph-mon.yaml @@ -70,6 +70,10 @@ parameters: MonitoringSubscriptionCephMon: default: 'overcloud-ceph-mon' type: string + CephPoolDefaultSize: + description: default minimum replication for RBD copies + type: number + default: 3 resources: CephBase: @@ -92,7 +96,7 @@ outputs: ceph::profile::params::mon_key: {get_param: CephMonKey} ceph::profile::params::osd_pool_default_pg_num: 32 ceph::profile::params::osd_pool_default_pgp_num: 32 - ceph::profile::params::osd_pool_default_size: 3 + ceph::profile::params::osd_pool_default_size: {get_param: CephPoolDefaultSize} # repeat returns items in a list, so we need to map_merge twice tripleo::profile::base::ceph::mon::ceph_pools: map_merge: |