From 8c427ecbc7dd382dcd1672e678be6a4fa27cae8a Mon Sep 17 00:00:00 2001
From: Michele Baldessari <michele@acksyn.org>
Date: Wed, 24 Jul 2019 13:37:40 +0200
Subject: [PATCH] Rename _short_bootstrap_node_ip to _bootstrap_node_ip

At least redis does use redis_bootstrap_node_ip and
_short_bootstrap_node_ip makes no sense anyway?
We moved to the ansible stuff via Id6a7b10acc65ca6cd2135796a80fad0723078871
and I got the following error on my deploy:

    Error: Evaluation Error: Error while evaluating a Function Call, Class[Redis::Sentinel]: parameter 'redis_host' expects a Stdlib::Host = Variant

Problem is that redis::sentinel::redis_host points to redis_bootstrap_node_ip
and that is set to nil now:
[root@overcloud-controller-0 hieradata]# hiera -c /etc/puppet/hiera.yaml redis_bootstrap_node_ip
nil

Change-Id: I9de426d0e3a84237418f4d5c8f476a66b07b4126
---
 roles/tripleo-hieradata/templates/all_nodes.j2 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/roles/tripleo-hieradata/templates/all_nodes.j2 b/roles/tripleo-hieradata/templates/all_nodes.j2
index 0fbc7f384..61888b54f 100644
--- a/roles/tripleo-hieradata/templates/all_nodes.j2
+++ b/roles/tripleo-hieradata/templates/all_nodes.j2
@@ -26,10 +26,10 @@
   {{ '"' ~ service ~ '_short_bootstrap_node_name": ' ~ (services | first | to_json) ~ ',' }}
   {% endif %}
 
-  {# <service>_bootstrap_node_ip: hostname #}
+  {# <service>_bootstrap_node_ip: ip #}
   {% set services = (groups[service] | default ([]) | map('extract', hostvars, service_net_map[service ~ '_network'] | default('ctlplane') ~ '_ip')) | list %}
   {% if (services | length) > 0 %}
-  {{ '"' ~ service ~ '_short_bootstrap_node_ip": ' ~ (services | first | to_json) ~ ',' }}
+  {{ '"' ~ service ~ '_bootstrap_node_ip": ' ~ (services | first | to_json) ~ ',' }}
   {% endif %}
 
   {% endfor %}