diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-08-08 20:02:52 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-08-08 20:02:52 +0000 |
| commit | ac6c502a69bef7f00633499e2d21b3ec756c21ae (patch) | |
| tree | ba9d420210107fe8887264bebfb5bf04c59d0937 /manifests/profile/base/ceph | |
| parent | 97e4aa5f761172477e0bccdcc762780ade71bf28 (diff) | |
| parent | 4581c173ca3fe0d5b98ba06e00c536a71320d2f4 (diff) | |
Merge "Convert ceph_pools into a hash type"
Diffstat (limited to 'manifests/profile/base/ceph')
| -rw-r--r-- | manifests/profile/base/ceph/mon.pp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/manifests/profile/base/ceph/mon.pp b/manifests/profile/base/ceph/mon.pp index 48c3721..b211120 100644 --- a/manifests/profile/base/ceph/mon.pp +++ b/manifests/profile/base/ceph/mon.pp @@ -19,8 +19,14 @@ # === Parameters # # [*ceph_pools*] -# (Optional) List of pools to create -# Defaults to [] +# (Optional) Hash of pools to create +# Example with hiera: +# tripleo::profile::base::ceph::mon::ceph_pools: +# mypool: +# size: 5 +# pg_num: 128 +# pgp_num: 128 +# Defaults to {} # # [*step*] # (Optional) The current step in deployment. See tripleo-heat-templates @@ -28,7 +34,7 @@ # Defaults to hiera('step') # class tripleo::profile::base::ceph::mon ( - $ceph_pools = [], + $ceph_pools = {}, $step = hiera('step'), ) { @@ -39,10 +45,6 @@ class tripleo::profile::base::ceph::mon ( } if $step >= 4 { - 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'), - } + create_resources('ceph::pool', $ceph_pools) } } |