From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 16 Jun 2017 23:25:23 +0000 (+0000)
Subject: Merge "Ensure hiera step value is an integer"
X-Git-Tag: opnfv-6.0.0~146
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=8ca7a1e390ce50ac66a6861dae59bb44fbf0324a;p=apex-puppet-tripleo.git

Merge "Ensure hiera step value is an integer"
---

8ca7a1e390ce50ac66a6861dae59bb44fbf0324a
diff --cc manifests/profile/base/database/redis.pp
index 3890244,830ffc6..e357359
--- a/manifests/profile/base/database/redis.pp
+++ b/manifests/profile/base/database/redis.pp
@@@ -34,10 -34,10 +34,10 @@@
  class tripleo::profile::base::database::redis (
    $bootstrap_nodeid = hiera('bootstrap_nodeid'),
    $redis_node_ips   = hiera('redis_node_ips'),
-   $step             = hiera('step'),
+   $step             = Integer(hiera('step')),
  ) {
    if $step >= 2 {
 -    if $bootstrap_nodeid == $::hostname {
 +    if downcase($bootstrap_nodeid) == $::hostname {
        $slaveof = undef
      } else {
        $slaveof = "${bootstrap_nodeid} 6379"