diff options
author | 2015-11-17 17:41:28 +0000 | |
---|---|---|
committer | 2015-11-17 17:41:28 +0000 | |
commit | cde9207a0da4968cb731937f5e7012a1d646bb00 (patch) | |
tree | 58ee29906ca20baf6b95da3b226f1c079992c546 /puppet/manifests/overcloud_controller.pp | |
parent | 2f2271a6a32d1b5b8f0008901b5163d65b0dc428 (diff) | |
parent | cba222c72f522db04fffa0d721526bae300b6bd1 (diff) |
Merge "Pass ceph::pool arguments when calling class"
Diffstat (limited to 'puppet/manifests/overcloud_controller.pp')
-rw-r--r-- | puppet/manifests/overcloud_controller.pp | 6 |
1 files changed, 2 insertions, 4 deletions
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 { |