aboutsummaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorSteven Hardy <shardy@redhat.com>2017-07-19 20:36:11 +0100
committermarios <marios@redhat.com>2017-07-24 14:02:44 +0300
commit0a44085af6ba31e81f8eac25a13b375a245b03da (patch)
tree5c6cbdfb2627364203fd5d8e61610cf90fd80801 /common
parentd364d9cca2fd8c703fab93ec97c1330bbe2401aa (diff)
Move docker_puppet_tasks calculation into services.yaml
This makes the RolesData output more accurate, and we can rework things so docker-puppet only gets run when there is a non-empty file calculated (e.g there are tasks to run). Change-Id: I8cdab3c857977c80fe2e359ab9e05740a838d66b
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 ab4ac36..350026c 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: