openstack/tripleo-heat-templates
Code Issues Proposed changes

Pass ceph::pool arguments when calling class

Browse Source 
Pass the ceph::pool properties as arguments to the class call
instead of setting them as class defaults.

Ceph recommends max 32 PGs and min 4 PGs per OSD so this change
also lowers the defaults to 32 which works with 1 OSD, suits well
a scenario with 3 OSDs and is easy to customize in the static
hiera if more than 8 OSDs are deployed.

More info at: https://bugzilla.redhat.com/show_bug.cgi?id=1252546

Change-Id: Ifed11d1857900b2251dfdf69d6b6f168150e6330
This commit is contained in:
Giulio Fidente 2015-11-11 11:51:23 +01:00
parent af8dd8bbe7
commit cba222c72f
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
puppet/hieradata/ceph.yaml
View File

@ -1,6 +1,6 @@
ceph::profile::params::osd_journal_size: 1024
ceph::profile::params::osd_pool_default_pg_num: 128
ceph::profile::params::osd_pool_default_pgp_num: 128
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_min_size: 1
ceph::profile::params::osds: {/srv/data: {}}

6
puppet/manifests/overcloud_controller.pp
View File

@ -307,15 +307,13 @@ if hiera('step') >= 3 {
if $enable_ceph {
Ceph_pool {
$ceph_pools = hiera('ceph_pools')
ceph::pool { $ceph_pools :
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'),
}
$ceph_pools = hiera('ceph_pools')
ceph::pool { $ceph_pools : }
$cinder_pool_requires = [Ceph::Pool[hiera('cinder_rbd_pool_name')]]
} else {

6
puppet/manifests/overcloud_controller_pacemaker.pp
View File

@ -683,15 +683,13 @@ if hiera('step') >= 3 {
if $enable_ceph {
Ceph_pool {
$ceph_pools = hiera('ceph_pools')
ceph::pool { $ceph_pools :
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'),
}
$ceph_pools = hiera('ceph_pools')
ceph::pool { $ceph_pools : }
$cinder_pool_requires = [Ceph::Pool[hiera('cinder_rbd_pool_name')]]
} else {