Merge "Use static environment for deployed-server neutron mappings"

[apex-tripleo-heat-templates.git] / common / services.yaml

diff --git a/common/services.yaml b/common/services.yaml
index ab4ac36..350026c 100644 (file)
--- a/common/services.yaml
+++ b/common/services.yaml
@@ -223,10 +223,10 @@ resources:
   DockerPuppetTasks:
     type: OS::Heat::Value
     properties:
-      type: comma_delimited_list
+      type: json
       value:
         yaql:
-          expression: coalesce($.data, []).where($ != null).select($.get('docker_puppet_tasks')).where($ != null).distinct()
+          expression: dict(coalesce($.data, []).where($ != null).select($.get('docker_puppet_tasks')).where($ != null).selectMany($.items()).groupBy($[0], $[1]))
           data: {get_attr: [ServiceChain, role_data]}
 
   HostPrepTasks: