diff options
| author |   Giulio Fidente <gfidente@redhat.com> | 2016-09-14 18:15:55 +0200 |
|---|---|---|
| committer | Giulio Fidente <gfidente@redhat.com> | 2016-09-19 11:52:14 +0200 |
| commit | 2f664a113a45219883c79019953aaed62858664c (patch) | |
| tree | b22fc8a14db65d2f3edb7e16f5cf9e9fc5cb1ba6 | |
| parent | d8f3e366a0f6d5bbdfd63d9caccb3b352b5ed60e (diff) | |
Use osd_pool_default_* puppet parameters when creating the pools
While it is possible to override the pg_num, pgp_num and size for
each pool, the defaults are hardcoded. This patch uses as default
the values given via ceph::profile::params::osd_pool_default_*
parameters, if any.
Closes-Bug: 1623590
Change-Id: Iecde772e7f72fd9abedb54cff4b8f2605df8fedd
| -rw-r--r-- | puppet/services/ceph-mon.yaml | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/puppet/services/ceph-mon.yaml b/puppet/services/ceph-mon.yaml index a2b3f13e..552086ab 100644 --- a/puppet/services/ceph-mon.yaml +++ b/puppet/services/ceph-mon.yaml @@ -76,6 +76,9 @@ outputs: - get_attr: [CephBase, role_data, config_settings] - ceph::profile::params::ms_bind_ipv6: {get_param: CephIPv6} 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 # repeat returns items in a list, so we need to map_merge twice tripleo::profile::base::ceph::mon::ceph_pools: map_merge: @@ -90,9 +93,9 @@ outputs: - {get_param: GnocchiRbdPoolName} template: <%pool%>: - pg_num: 32 - pgp_num: 32 - size: 3 + pg_num: "%{hiera('ceph::profile::params::osd_pool_default_pg_num')}" + pgp_num: "%{hiera('ceph::profile::params::osd_pool_default_pgp_num')}" + size: "%{hiera('ceph::profile::params::osd_pool_default_size')}" - {get_param: CephPools} tripleo.ceph_mon.firewall_rules: '110 ceph_mon': |