aboutsummaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-07-24 18:06:20 +0000
committerGerrit Code Review <review@openstack.org>2017-07-24 18:06:20 +0000
commita703631f0baedbbe03185c90947284b4f825b326 (patch)
treec089b5664bad226c94435e1961ee854af2c26eb0 /common
parent94f93101a9fc10e8999334ea594804af7c32c2fd (diff)
parent0a44085af6ba31e81f8eac25a13b375a245b03da (diff)
Merge "Move docker_puppet_tasks calculation into services.yaml"
Diffstat (limited to 'common')
-rw-r--r--common/services.yaml4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/services.yaml b/common/services.yaml
index ab4ac361..350026cc 100644
--- 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: