summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-07-04 08:14:07 +0000
committerGerrit Code Review <review@openstack.org>2016-07-04 08:14:07 +0000
commitdc7734066f6c30d6891410f2a24bd8c0fefebbbb (patch)
tree3f9033cef1cc0e36c2b2ed22c8fb779ff12ec5ad
parent389e7b42c0c1d9e81de928c6cc6763c294a9db6b (diff)
parent230ae767d6debd5464dc317934b0e786de83b1be (diff)
Merge "Support deprecated enable_ceph_storage boolean"
-rw-r--r--manifests/profile/base/ceph.pp10
1 files changed, 10 insertions, 0 deletions
diff --git a/manifests/profile/base/ceph.pp b/manifests/profile/base/ceph.pp
index 29ca9ae..94166ac 100644
--- a/manifests/profile/base/ceph.pp
+++ b/manifests/profile/base/ceph.pp
@@ -35,6 +35,10 @@
# mon_host when ceph_ipv6 is true
# Defaults to undef
#
+# [*enable_ceph_storage*]
+# (Optional) enable_ceph_storage
+# Deprecated: defaults to false
+#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
@@ -45,6 +49,7 @@ class tripleo::profile::base::ceph (
$ceph_mon_initial_members = undef,
$ceph_mon_host = undef,
$ceph_mon_host_v6 = undef,
+ $enable_ceph_storage = false,
$step = hiera('step'),
) {
@@ -67,4 +72,9 @@ class tripleo::profile::base::ceph (
include ::ceph::conf
}
+
+ # TODO: deprecated boolean
+ if $enable_ceph_storage {
+ include ::tripleo::profile::base::ceph::osd
+ }
}