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/nova/compute/ironic.pp  | 2 --
 manifests/profile/base/nova/compute/libvirt.pp | 1 -
 manifests/profile/base/nova/conductor.pp       | 2 --
 manifests/profile/base/nova/consoleauth.pp     | 2 --
 manifests/profile/base/nova/libvirt.pp         | 1 -
 manifests/profile/base/nova/scheduler.pp       | 2 --
 manifests/profile/base/nova/vncproxy.pp        | 2 --
 7 files changed, 12 deletions(-)

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

diff --git a/manifests/profile/base/nova/compute/ironic.pp b/manifests/profile/base/nova/compute/ironic.pp
index a01e90f..c0213fb 100644
--- a/manifests/profile/base/nova/compute/ironic.pp
+++ b/manifests/profile/base/nova/compute/ironic.pp
@@ -26,11 +26,9 @@
 class tripleo::profile::base::nova::compute::ironic (
   $step = hiera('step'),
 ) {
-
   if $step >= 4 {
     include ::tripleo::profile::base::nova::compute
     include ::nova::compute::ironic
     include ::nova::network::neutron
   }
-
 }
diff --git a/manifests/profile/base/nova/compute/libvirt.pp b/manifests/profile/base/nova/compute/libvirt.pp
index 5b6f895..956f8ad 100644
--- a/manifests/profile/base/nova/compute/libvirt.pp
+++ b/manifests/profile/base/nova/compute/libvirt.pp
@@ -26,7 +26,6 @@
 class tripleo::profile::base::nova::compute::libvirt (
   $step = hiera('step'),
 ) {
-
   if $step >= 4 {
     include ::tripleo::profile::base::nova::compute
 
diff --git a/manifests/profile/base/nova/conductor.pp b/manifests/profile/base/nova/conductor.pp
index 04c9d06..fa9f12b 100644
--- a/manifests/profile/base/nova/conductor.pp
+++ b/manifests/profile/base/nova/conductor.pp
@@ -26,10 +26,8 @@
 class tripleo::profile::base::nova::conductor (
   $step = hiera('step'),
 ) {
-
   include ::tripleo::profile::base::nova
   if $step >= 4 {
     include ::nova::conductor
   }
-
 }
diff --git a/manifests/profile/base/nova/consoleauth.pp b/manifests/profile/base/nova/consoleauth.pp
index 442cf84..8ccfb8c 100644
--- a/manifests/profile/base/nova/consoleauth.pp
+++ b/manifests/profile/base/nova/consoleauth.pp
@@ -26,10 +26,8 @@
 class tripleo::profile::base::nova::consoleauth (
   $step = hiera('step'),
 ) {
-
   if $step >= 4 {
     include ::tripleo::profile::base::nova
     include ::nova::consoleauth
   }
-
 }
diff --git a/manifests/profile/base/nova/libvirt.pp b/manifests/profile/base/nova/libvirt.pp
index 29ef372..889b80d 100644
--- a/manifests/profile/base/nova/libvirt.pp
+++ b/manifests/profile/base/nova/libvirt.pp
@@ -26,7 +26,6 @@
 class tripleo::profile::base::nova::libvirt (
   $step = hiera('step'),
 ) {
-
   if $step >= 4 {
     include ::tripleo::profile::base::nova
     include ::nova::compute::libvirt::services
diff --git a/manifests/profile/base/nova/scheduler.pp b/manifests/profile/base/nova/scheduler.pp
index 13b4e82..3c9b2c2 100644
--- a/manifests/profile/base/nova/scheduler.pp
+++ b/manifests/profile/base/nova/scheduler.pp
@@ -26,11 +26,9 @@
 class tripleo::profile::base::nova::scheduler (
   $step = hiera('step'),
 ) {
-
   if $step >= 4 {
     include ::tripleo::profile::base::nova
     include ::nova::scheduler
     include ::nova::scheduler::filter
   }
-
 }
diff --git a/manifests/profile/base/nova/vncproxy.pp b/manifests/profile/base/nova/vncproxy.pp
index aa0cc7b..f654fef 100644
--- a/manifests/profile/base/nova/vncproxy.pp
+++ b/manifests/profile/base/nova/vncproxy.pp
@@ -26,10 +26,8 @@
 class tripleo::profile::base::nova::vncproxy (
   $step = hiera('step'),
 ) {
-
   if $step >= 4 {
     include ::tripleo::profile::base::nova
     include ::nova::vncproxy
   }
-
 }
-- 
cgit 1.2.3-korg