From 70b1daa42b41a441b34387a2e76ad3b39900ed8c Mon Sep 17 00:00:00 2001 From: Martin Schuppert Date: Fri, 12 Jul 2019 12:06:03 +0200 Subject: [PATCH] Create _cell_node_names if nova_additional_cell I9a37d1faec73a81a28d8f89d86375fb15ee765c7 moved to use ansible for all_nodes hieradata. This also removed to create the SERVICE_cell_node_names in in net_ip_list_map.j2.yaml. This change creates the _cell_node_names if nova_additional_cell is true. Depends-On: https://review.opendev.org/670487 Change-Id: I33effbf481682402d39436a9e97cbd3ee2044577 --- roles/tripleo-hieradata/templates/all_nodes.j2 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/roles/tripleo-hieradata/templates/all_nodes.j2 b/roles/tripleo-hieradata/templates/all_nodes.j2 index fc5f31e5b..0fbc7f384 100644 --- a/roles/tripleo-hieradata/templates/all_nodes.j2 +++ b/roles/tripleo-hieradata/templates/all_nodes.j2 @@ -9,8 +9,13 @@ {# _node_ips: #} {{ '"' ~ service ~ '_node_ips": ' ~ (groups[service] | default ([]) | map('extract', hostvars, service_net_map[service ~ '_network'] | default('ctlplane') ~ '_ip') | list | to_json) ~ ',' }} + {% if nova_additional_cell %} + {# _cell_node_names: #} + {{ '"' ~ service ~ '_cell_node_names": ' ~ (groups[service] | default ([]) | map('extract', hostvars, service_net_map[service ~ '_network'] | default('ctlplane') ~ '_hostname') | list | to_json) ~ ',' }} + {% else %} {# _node_names: #} {{ '"' ~ service ~ '_node_names": ' ~ (groups[service] | default ([]) | map('extract', hostvars, service_net_map[service ~ '_network'] | default('ctlplane') ~ '_hostname') | list | to_json) ~ ',' }} + {% endif %} {# _short_node_names: #} {{ '"' ~ service ~ '_short_node_names": ' ~ (groups[service] | default ([]) | map('extract', hostvars, 'inventory_hostname') | list | to_json) ~ ',' }}