Always use sorted group for bootstrap node.
Once the tripleo-heat-templates patch has merged, the condition that checked the sorted_bootstrap_node var can be removed. Depends-On: I6b93f5b0747c5a11d24615a3bbb5516f9be81401 Change-Id: I4b280bcafce42bba4c823b8205f296b83e2f3e5d
This commit is contained in:
parent
2f6cc5cdff
commit
b6f64b06fe
|
@ -20,18 +20,10 @@
|
|||
{% set services = services + all_nodes_extra_map_data[service ~ '_short_bootstrap_node_name'] %}
|
||||
{% endif %}
|
||||
{% if (services | length) > 0 %}
|
||||
{% if sorted_bootstrap_node | default(false) %}
|
||||
{% set _ = all_nodes.__setitem__((service ~ '_short_bootstrap_node_name'), (services | sort | first)) %}
|
||||
{% else %}
|
||||
{% set _ = all_nodes.__setitem__((service ~ '_short_bootstrap_node_name'), (services | first)) %}
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
{# <service>_bootstrap_node_ip: hostname #}
|
||||
{% if sorted_bootstrap_node | default(false) %}
|
||||
{% set services = (groups[service] | default ([]) | sort | map('extract', hostvars, service_net_map[service ~ '_network'] | default('ctlplane') ~ '_ip')) | list %}
|
||||
{% else %}
|
||||
{% set services = (groups[service] | default ([]) | map('extract', hostvars, service_net_map[service ~ '_network'] | default('ctlplane') ~ '_ip')) | list %}
|
||||
{% endif %}
|
||||
{% if all_nodes_extra_map_data[service ~ '_short_bootstrap_node_ip'] is defined %}
|
||||
{% set services = services + [all_nodes_extra_map_data[service ~ '_short_bootstrap_node_ip']] %}
|
||||
{% endif %}
|
||||
|
|
|
@ -1,8 +1,4 @@
|
|||
{% set boostrap_node = {} %}
|
||||
{% if sorted_bootstrap_node | default(false) %}
|
||||
{% set _ = boostrap_node.__setitem__('boostrap_node_id', groups[tripleo_role_name] | sort | first) %}
|
||||
{% else %}
|
||||
{% set _ = boostrap_node.__setitem__('boostrap_node_id', groups[tripleo_role_name] | first) %}
|
||||
{% endif %}
|
||||
{# RENDER #}
|
||||
{{ boostrap_node | to_nice_json }}
|
||||
|
|
Loading…
Reference in New Issue