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/monitoring/fluentd.pp  |  1 -
 manifests/profile/base/monitoring/rabbitmq.pp | 16 ++++++++--------
 manifests/profile/base/monitoring/sensu.pp    |  2 --
 manifests/profile/base/monitoring/uchiwa.pp   |  1 -
 4 files changed, 8 insertions(+), 12 deletions(-)

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

diff --git a/manifests/profile/base/monitoring/fluentd.pp b/manifests/profile/base/monitoring/fluentd.pp
index 1ea7d39..8160452 100644
--- a/manifests/profile/base/monitoring/fluentd.pp
+++ b/manifests/profile/base/monitoring/fluentd.pp
@@ -25,7 +25,6 @@
 class tripleo::profile::base::monitoring::fluentd (
   $step = hiera('step', undef)
 ) {
-
   if $step == undef or $step >= 3 {
     include ::fluentd
 
diff --git a/manifests/profile/base/monitoring/rabbitmq.pp b/manifests/profile/base/monitoring/rabbitmq.pp
index 4c5ad41..cfd5016 100644
--- a/manifests/profile/base/monitoring/rabbitmq.pp
+++ b/manifests/profile/base/monitoring/rabbitmq.pp
@@ -18,22 +18,22 @@
 #
 # === Parameters
 #
-# [*vhost*]
-#   (Optional) String. RabbitMQ vhost to be used by Sensu
-#   Defaults to '/sensu'
+# [*password*]
+#   (Optional) String. Password to connect to RabbitMQ server
+#   Defaults to hiera('rabbit_password', undef)
 #
 # [*user*]
 #   (Optional) String. Username to connect to RabbitMQ server
 #   Defaults to hiera('rabbit_username', 'sensu')
 #
-# [*password*]
-#   (Optional) String. Password to connect to RabbitMQ server
-#   Defaults to hiera('rabbit_password', undef)
+# [*vhost*]
+#   (Optional) String. RabbitMQ vhost to be used by Sensu
+#   Defaults to '/sensu'
 #
 class tripleo::profile::base::monitoring::rabbitmq (
-  $vhost    = hiera('monitoring_rabbitmq_vhost', '/sensu'),
-  $user     = hiera('monitoring_rabbitmq_username', 'sensu'),
   $password = hiera('monitoring_rabbitmq_password', undef),
+  $user     = hiera('monitoring_rabbitmq_username', 'sensu'),
+  $vhost    = hiera('monitoring_rabbitmq_vhost', '/sensu'),
 ) {
   rabbitmq_vhost { 'sensu-rabbit-vhost':
     ensure => present,
diff --git a/manifests/profile/base/monitoring/sensu.pp b/manifests/profile/base/monitoring/sensu.pp
index af09059..a6872b3 100644
--- a/manifests/profile/base/monitoring/sensu.pp
+++ b/manifests/profile/base/monitoring/sensu.pp
@@ -25,10 +25,8 @@
 class tripleo::profile::base::monitoring::sensu (
   $step = hiera('step', undef),
 ) {
-
   if $step == undef or $step >= 3 {
     include ::sensu
-
     package { 'osops-tools-monitoring-oschecks':
       ensure => 'present'
     }
diff --git a/manifests/profile/base/monitoring/uchiwa.pp b/manifests/profile/base/monitoring/uchiwa.pp
index 7c61f3e..2674b5f 100644
--- a/manifests/profile/base/monitoring/uchiwa.pp
+++ b/manifests/profile/base/monitoring/uchiwa.pp
@@ -25,7 +25,6 @@
 class tripleo::profile::base::monitoring::uchiwa (
   $step = hiera('step', undef),
 ) {
-
   if $step == undef or $step >= 3 {
     include ::uchiwa
   }
-- 
cgit 1.2.3-korg