From 98a9181fad3904e3a82dc128834e8099ca55119b Mon Sep 17 00:00:00 2001 From: James Slagle Date: Mon, 11 Nov 2019 11:23:11 -0500 Subject: [PATCH] Fix enabled_services to include all_nodes_extra_map_data When the tripleo-hieradata role was imported[1] from tripleo-common[2], the handling to create all_enabled_services from enabled_services and all_nodes_extra_map_data was lost. This caused several data items to be missing in the multi-stack case. This patch restores the original functionality. [1] https://review.opendev.org/#/c/673364/ [2] https://review.opendev.org/#/c/673366/ Change-Id: Ia58fd299942954c39214bad76cbcf40ad4371f18 --- .../roles/tripleo-hieradata/templates/all_nodes.j2 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tripleo_ansible/roles/tripleo-hieradata/templates/all_nodes.j2 b/tripleo_ansible/roles/tripleo-hieradata/templates/all_nodes.j2 index ed6caf90e..582054f81 100644 --- a/tripleo_ansible/roles/tripleo-hieradata/templates/all_nodes.j2 +++ b/tripleo_ansible/roles/tripleo-hieradata/templates/all_nodes.j2 @@ -1,6 +1,7 @@ {% set all_nodes = {} %} -{% set _ = all_nodes.__setitem__('enabled_services', ((enabled_services + all_nodes_extra_map_data['enabled_services'] | default ([])) | unique)) %} -{% for service in enabled_services %} +{% set all_enabled_services = ((enabled_services + all_nodes_extra_map_data['enabled_services'] | default ([])) | unique) %} +{% set _ = all_nodes.__setitem__('enabled_services', all_enabled_services) %} +{% for service in all_enabled_services %} {# _enabled: true #} {% set _ = all_nodes.__setitem__((service ~ '_enabled'), true) %} {# _node_ips: #}