Merge "use parameter to lookup the step instead of hiera again"

3 files changed, 5 insertions, 5 deletions

diff --git a/manifests/profile/base/database/mysql.pp b/manifests/profile/base/database/mysql.pp
index 9552e10..27df6e4 100644
--- a/manifests/profile/base/database/mysql.pp
+++ b/manifests/profile/base/database/mysql.pp
@@ -52,7 +52,7 @@ class tripleo::profile::base::database::mysql (
   # ha scenario
     $mysql_step = 1
   }
-  if hiera('step') >= $mysql_step {
+  if $step >= $mysql_step {
     if str2bool(hiera('enable_galera', true)) {
       $mysql_config_file = '/etc/my.cnf.d/galera.cnf'
     } else {
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,
diff --git a/manifests/profile/base/pacemaker.pp b/manifests/profile/base/pacemaker.pp
index de107a9..1785656 100644
--- a/manifests/profile/base/pacemaker.pp
+++ b/manifests/profile/base/pacemaker.pp
@@ -38,9 +38,9 @@ class tripleo::profile::base::pacemaker (
     $pacemaker_master = false
   }
 
-  $enable_fencing = str2bool(hiera('enable_fencing', false)) and hiera('step') >= 5
+  $enable_fencing = str2bool(hiera('enable_fencing', false)) and $step >= 5
 
-  if hiera('step') >= 1 {
+  if $step >= 1 {
     $pacemaker_cluster_members = downcase(regsubst(hiera('controller_node_names'), ',', ' ', 'G'))
     $corosync_ipv6 = str2bool(hiera('corosync_ipv6', false))
     if $corosync_ipv6 {
@@ -78,7 +78,7 @@ class tripleo::profile::base::pacemaker (
     }
   }
 
-  if hiera('step') >= 2 {
+  if $step >= 2 {
     if $pacemaker_master {
       include ::pacemaker::resource_defaults