diff options
Diffstat (limited to 'manifests/profile/base/ceph')
-rw-r--r-- | manifests/profile/base/ceph/client.pp | 1 | ||||
-rw-r--r-- | manifests/profile/base/ceph/mon.pp | 19 | ||||
-rw-r--r-- | manifests/profile/base/ceph/osd.pp | 3 |
3 files changed, 11 insertions, 12 deletions
diff --git a/manifests/profile/base/ceph/client.pp b/manifests/profile/base/ceph/client.pp index 851324a..53f09c2 100644 --- a/manifests/profile/base/ceph/client.pp +++ b/manifests/profile/base/ceph/client.pp @@ -26,7 +26,6 @@ class tripleo::profile::base::ceph::client ( $step = hiera('step'), ) { - include ::tripleo::profile::base::ceph if $step >= 2 { diff --git a/manifests/profile/base/ceph/mon.pp b/manifests/profile/base/ceph/mon.pp index 48c3721..c0768b6 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,10 +34,9 @@ # Defaults to hiera('step') # class tripleo::profile::base::ceph::mon ( - $ceph_pools = [], + $ceph_pools = {}, $step = hiera('step'), ) { - include ::tripleo::profile::base::ceph if $step >= 2 { @@ -39,10 +44,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) } } diff --git a/manifests/profile/base/ceph/osd.pp b/manifests/profile/base/ceph/osd.pp index a9224d3..6940bca 100644 --- a/manifests/profile/base/ceph/osd.pp +++ b/manifests/profile/base/ceph/osd.pp @@ -31,10 +31,9 @@ class tripleo::profile::base::ceph::osd ( $ceph_osd_selinux_permissive = false, $step = hiera('step'), ) { - include ::tripleo::profile::base::ceph - if $step >= 2 { + if $step >= 3 { if $ceph_osd_selinux_permissive { exec { 'set selinux to permissive on boot': command => "sed -ie 's/^SELINUX=.*/SELINUX=permissive/' /etc/selinux/config", |