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/swift/add_devices.pp |  3 +--
 manifests/profile/base/swift/proxy.pp       |  2 --
 manifests/profile/base/swift/ringbuilder.pp | 33 ++++++++++++++++-------------
 manifests/profile/base/swift/storage.pp     | 11 +++++-----
 4 files changed, 24 insertions(+), 25 deletions(-)

(limited to 'manifests/profile/base/swift')

diff --git a/manifests/profile/base/swift/add_devices.pp b/manifests/profile/base/swift/add_devices.pp
index f61f418..bd4c91c 100644
--- a/manifests/profile/base/swift/add_devices.pp
+++ b/manifests/profile/base/swift/add_devices.pp
@@ -20,11 +20,10 @@
 #
 # [*swift_zones*]
 #   (Optional) The number of swift zones.
-
+#
 define tripleo::profile::base::swift::add_devices(
   $swift_zones = '1'
 ){
-
   # NOTE(dprince): Swift zones is not yet properly wired into the Heat
   # templates. See: https://review.openstack.org/#/c/97758/3
   # For now our regex supports the r1z1-192.0.2.6:%PORT%/d1 syntax or the
diff --git a/manifests/profile/base/swift/proxy.pp b/manifests/profile/base/swift/proxy.pp
index 40e61ae..1e763a1 100644
--- a/manifests/profile/base/swift/proxy.pp
+++ b/manifests/profile/base/swift/proxy.pp
@@ -23,11 +23,9 @@
 #   for more details.
 #   Defaults to hiera('step')
 #
-#
 class tripleo::profile::base::swift::proxy (
   $step = hiera('step'),
 ) {
-
   if $step >= 4 {
     include ::swift::proxy
     include ::swift::proxy::proxy_logging
diff --git a/manifests/profile/base/swift/ringbuilder.pp b/manifests/profile/base/swift/ringbuilder.pp
index d94c6be..e0f67cd 100644
--- a/manifests/profile/base/swift/ringbuilder.pp
+++ b/manifests/profile/base/swift/ringbuilder.pp
@@ -18,30 +18,33 @@
 #
 # === Parameters
 #
-# [*step*]
+#  [*replicas*]
+#    replicas
+#
+#  [*build_ring*] = true,
+#   (Optional) Whether to build the ring
+#   Defaults to true
+#
+#  [*devices*]
+#   (Optional) The swift devices
+#   Defaults to ''
+#
+#  [*step*]
 #   (Optional) The current step in deployment. See tripleo-heat-templates
 #   for more details.
 #   Defaults to hiera('step')
+#
 #  [*swift_zones*]
 #   (Optional) The swift zones
 #   Defaults to 1
-#  [*devices*]
-#   (Optional) The swift devices
-#   Defaults to ''
-#  [*build_ring*]      = true,
-#   (Optional) Whether to build the ring
-#   Defaults to true
-#  [*replicas*]
-#    replicas
-
+#
 class tripleo::profile::base::swift::ringbuilder (
-  $step = hiera('step'),
-  $swift_zones     = '1',
-  $devices         = '',
-  $build_ring      = true,
   $replicas,
+  $build_ring  = true,
+  $devices     = '',
+  $step        = hiera('step'),
+  $swift_zones = '1',
 ) {
-
   if $step >= 2 {
     # pre-install swift here so we can build rings
     include ::swift
diff --git a/manifests/profile/base/swift/storage.pp b/manifests/profile/base/swift/storage.pp
index 371cb0d..5e266a9 100644
--- a/manifests/profile/base/swift/storage.pp
+++ b/manifests/profile/base/swift/storage.pp
@@ -18,21 +18,20 @@
 #
 # === Parameters
 #
+# [*enable_swift_storage*]
+#   (Optional) enable_swift_storage
+#   Deprecated: defaults to true
+#
 # [*step*]
 #   (Optional) The current step in deployment. See tripleo-heat-templates
 #   for more details.
 #   Defaults to hiera('step')
 #
-# [*enable_swift_storage*]
-#   (Optional) enable_swift_storage
-#   Deprecated: defaults to true
-#
 class tripleo::profile::base::swift::storage (
-  $step                 = hiera('step'),
   # Deprecated conditional to support ControllerEnableSwiftStorage parameter
   $enable_swift_storage = true,
+  $step                 = hiera('step'),
 ) {
-
   if $step >= 4 {
     if $enable_swift_storage {
       include ::swift::storage::all
-- 
cgit 1.2.3-korg