openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Pass ceph::pool arguments when calling class"

Browse Source
This commit is contained in:
Jenkins 2015-11-17 17:41:28 +00:00 committed by Gerrit Code Review
commit cde9207a0d
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 {