diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-11-17 17:41:28 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-11-17 17:41:28 +0000 |
| commit | cde9207a0da4968cb731937f5e7012a1d646bb00 (patch) | |
| tree | 58ee29906ca20baf6b95da3b226f1c079992c546 | |
| parent | 2f2271a6a32d1b5b8f0008901b5163d65b0dc428 (diff) | |
| parent | cba222c72f522db04fffa0d721526bae300b6bd1 (diff) | |
Merge "Pass ceph::pool arguments when calling class"
| -rw-r--r-- | puppet/hieradata/ceph.yaml | 4 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_controller.pp | 6 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 6 |
3 files changed, 6 insertions, 10 deletions
diff --git a/puppet/hieradata/ceph.yaml b/puppet/hieradata/ceph.yaml index ca6d3954..1e480e60 100644 --- a/puppet/hieradata/ceph.yaml +++ b/puppet/hieradata/ceph.yaml @@ -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: {}} diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp index 34be39f3..63f89ec0 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp @@ -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 { diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index b9623714..02988412 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -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 { |