openstack
/
tripleo-common
Code Issues Proposed changes

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
This commit is contained in:
Michele Baldessari 2019-07-24 13:37:40 +02:00
parent 8c703cede1
commit 8c427ecbc7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
roles/tripleo-hieradata/templates/all_nodes.j2
View File

@ -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 %}