From: Giulio Fidente <gfidente@redhat.com>
Date: Fri, 1 Jul 2016 12:52:40 +0000 (+0200)
Subject: Support deprecated enable_ceph_storage boolean
X-Git-Tag: opnfv-6.0.0~707^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=230ae767d6debd5464dc317934b0e786de83b1be;p=apex-puppet-tripleo.git

Support deprecated enable_ceph_storage boolean

This was missing in the initial revision of the Ceph modules but we
want to support usage of the old parameter for a cycle.

Change-Id: I7ac096feb9f5655003becd79d2eea355a047c90b
---

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
+  }
 }