From 689d80e97188342c84bb965980d48c8ed212e60d Mon Sep 17 00:00:00 2001 From: Carlos Camacho 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/ironic/api.pp | 4 ++-- manifests/profile/base/ironic/conductor.pp | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'manifests/profile/base/ironic') diff --git a/manifests/profile/base/ironic/api.pp b/manifests/profile/base/ironic/api.pp index 1406e2d..020cacb 100644 --- a/manifests/profile/base/ironic/api.pp +++ b/manifests/profile/base/ironic/api.pp @@ -23,10 +23,10 @@ # Defaults to hiera('step') # class tripleo::profile::base::ironic::api ( - $step = hiera('step'), + $step = hiera('step'), ) { - include ::tripleo::profile::base::ironic + if $step >= 4 { include ::ironic::api } diff --git a/manifests/profile/base/ironic/conductor.pp b/manifests/profile/base/ironic/conductor.pp index 7a587a5..2cb61fb 100644 --- a/manifests/profile/base/ironic/conductor.pp +++ b/manifests/profile/base/ironic/conductor.pp @@ -23,9 +23,8 @@ # Defaults to hiera('step') # class tripleo::profile::base::ironic::conductor ( - $step = hiera('step'), + $step = hiera('step'), ) { - include ::tripleo::profile::base::ironic if $step >= 4 { -- cgit 1.2.3-korg