From 95b432e9bc6295ed9f544db6077143c2f0660165 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Thu, 21 Jul 2016 09:50:56 -0400 Subject: use parameter to lookup the step instead of hiera again In some profiles, we were looking up the $step by using Hiera again, while we already do it in the parameter definition. When using this class outside THT, it will fail but with this patch, we could use just set the $step parameter and the rest of the manifest will work. Change-Id: I7082f47204fb4e529b164e4c4f1032e7bdd88f02 --- manifests/profile/base/heat.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifests/profile/base/heat.pp') diff --git a/manifests/profile/base/heat.pp b/manifests/profile/base/heat.pp index fa0e2f1..1311f20 100644 --- a/manifests/profile/base/heat.pp +++ b/manifests/profile/base/heat.pp @@ -44,7 +44,7 @@ class tripleo::profile::base::heat ( # 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 hiera('step') == 3 or hiera('step') == 4 { + if $step == 3 or $step == 4 { class { '::heat::keystone::domain': manage_domain => false, manage_user => false, -- cgit 1.2.3-korg