From e2326868ed9d15592876a69809c5fbf88eb12880 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Fri, 6 Dec 2019 17:02:35 -0500
Subject: [PATCH] overcloud/service_names: merge service_names &
 enabled_services

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
(cherry picked from commit f5d8df16d9e7d5008ec726cb33bec9c588fbf7fe)
---
 overcloud.j2.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml
index 447c28491f..529df7422a 100644
--- a/overcloud.j2.yaml
+++ b/overcloud.j2.yaml
@@ -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: