openstack/tripleo-heat-templates
Code Issues Proposed changes

overcloud/service_names: merge service_names & enabled_services

Browse Source 
When building ServiceNames, make sure we merge the YAQL results of both
enabled_services & service_names queries; so we don't end up with
duplicates.

Change-Id: I1f062b8b9f936e6fbf2febf64244e91b59b8ba1b
Related-Bug: #1855138
This commit is contained in:
Emilien Macchi 2019-12-06 17:02:35 -05:00
parent d642bf9ef9
commit d0563f185b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
overcloud.j2.yaml
View File

@ -643,7 +643,7 @@ resources:
type: comma_delimited_list
value:
yaql:
expression: let(root => $) -> $.data.extra_services.items().where($[0] in coalesce($root.data.enabled_services, [])).select($[1]).flatten() + coalesce($root.data.enabled_services, [])
expression: let(root => $) -> distinct($.data.extra_services.items().where($[0] in coalesce($root.data.enabled_services, [])).select($[1]).flatten() + coalesce($root.data.enabled_services, []))
data:
enabled_services: {get_attr: [{{role.name}}ServiceChainRoleData, value, service_names]}
extra_services: