diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-05-23 15:58:48 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-05-23 15:58:48 +0000 |
| commit | aeb11f384fe8e221c9bd62b8b86ecb1da4003777 (patch) | |
| tree | e0d9c070ee4e072542a2c5b0a49960c4641ba1fa /puppet | |
| parent | ecc231438850a057e3dca8bc9673c9e22d54213d (diff) | |
| parent | cdfe03566354b938e94c6863b0d4b1c3e64cc10c (diff) | |
Merge "Remove osd_pool_default_min_size to allow Ceph cluster to do the right thing by default"
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 5f19af68..e12c55eb 100644 --- a/puppet/services/ceph-base.yaml +++ b/puppet/services/ceph-base.yaml @@ -99,7 +99,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 c36f0537..28552301 100644 --- a/puppet/services/ceph-mon.yaml +++ b/puppet/services/ceph-mon.yaml @@ -78,6 +78,10 @@ parameters: MonitoringSubscriptionCephMon: default: 'overcloud-ceph-mon' type: string + CephPoolDefaultSize: + description: default minimum replication for RBD copies + type: number + default: 3 resources: CephBase: @@ -102,7 +106,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: |