Merge "Ensure hiera step value is an integer"

diff --cc manifests/profile/base/database/redis.pp
index 3890244,830ffc6..e357359
--- 1/manifests/profile/base/database/redis.pp
--- 2/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"

diff --cc manifests/profile/base/gnocchi/api.pp
Simple merge

diff --cc manifests/profile/base/pacemaker.pp
Simple merge

diff --cc manifests/profile/base/pacemaker_remote.pp
Simple merge

diff --cc manifests/profile/pacemaker/ovn_northd.pp
Simple merge