From 689d80e97188342c84bb965980d48c8ed212e60d Mon Sep 17 00:00:00 2001
From: Carlos Camacho <ccamacho@redhat.com>
Date: Fri, 5 Aug 2016 11:54:25 +0200
Subject: Fix parameters and headers inconsistency in the puppet manifests.

As we are staring to manually check overcloud services
the first step is to check that the puppet profiles
are all aligned.

Changes applied:

  No logic added or removed in this submission.

  Removed unused parameters.

  Align header comments structure.

  All profiles parameters sorted following:
  "Mandatory params first sorted alphabetically
  then optional params sorted alphabetically."

Note: Following submissions will check pacemaker,
cinder, mistral and redis services in the base profiles
as some of them has the $pacemaker_master parameter
defaulted to true.

Change-Id: I2f91c3f6baa33f74b5625789eec83233179a9655
---
 manifests/profile/base/heat.pp | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

(limited to 'manifests/profile/base/heat.pp')

diff --git a/manifests/profile/base/heat.pp b/manifests/profile/base/heat.pp
index 1311f20..8512d6e 100644
--- a/manifests/profile/base/heat.pp
+++ b/manifests/profile/base/heat.pp
@@ -18,15 +18,6 @@
 #
 # === Parameters
 #
-# [*step*]
-#   (Optional) The current step in deployment. See tripleo-heat-templates
-#   for more details.
-#   Defaults to hiera('step')
-#
-# [*notification_driver*]
-#   (Optional) Heat notification driver to use.
-#   Defaults to 'messaging'
-#
 # [*bootstrap_master*]
 #   (Optional) The hostname of the node responsible for bootstrapping
 #   Defaults to downcase(hiera('bootstrap_nodeid'))
@@ -35,13 +26,21 @@
 #   (Optional) Whether keystone token flushing should be enabled
 #   Defaults to hiera('keystone_enable_db_purge', true)
 #
+# [*notification_driver*]
+#   (Optional) Heat notification driver to use.
+#   Defaults to 'messaging'
+#
+# [*step*]
+#   (Optional) The current step in deployment. See tripleo-heat-templates
+#   for more details.
+#   Defaults to hiera('step')
+#
 class tripleo::profile::base::heat (
-  $step = hiera('step'),
+  $bootstrap_master    = downcase(hiera('bootstrap_nodeid')),
+  $manage_db_purge     = hiera('heat_enable_db_purge', true),
   $notification_driver = 'messaging',
-  $bootstrap_master = downcase(hiera('bootstrap_nodeid')),
-  $manage_db_purge = hiera('heat_enable_db_purge', true),
+  $step                = hiera('step'),
 ) {
-
   # Domain resources will be created at step5 on the pacemaker_master so we
   # configure heat.conf at step3 and 4 but actually create the domain later.
   if $step == 3 or $step == 4 {
-- 
cgit 1.2.3-korg