openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Do not use the 3rd argument of yaql groupBy"

Browse Source
This commit is contained in:
Zuul 2018-02-20 07:18:53 +00:00 committed by Gerrit Code Review
commit 2218e7baba
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
overcloud.j2.yaml
View File

@ -532,7 +532,7 @@ resources:
# list of maps, but appends to colliding lists so we can # list of maps, but appends to colliding lists so we can
# create a map of lists for all nodes for each network # create a map of lists for all nodes for each network
yaql: yaql:
expression: dict($.data.where($ != null).flatten().selectMany($.items()).groupBy($[0], $[1], $.flatten())) expression: dict($.data.where($ != null).flatten().selectMany($.items()).groupBy($[0], $[1]).select([$[0], $[1].flatten()]))
data: data:
- {get_attr: [{{role.name}}, hostname_map]} - {get_attr: [{{role.name}}, hostname_map]}
@ -688,7 +688,7 @@ resources:
# list of maps, but appends to colliding lists when a service # list of maps, but appends to colliding lists when a service
# is deployed on more than one role # is deployed on more than one role
yaql: yaql:
expression: dict($.data.l.where($ != null).selectMany($.items()).groupBy($[0], $[1], $.flatten())) expression: dict($.data.l.where($ != null).selectMany($.items()).groupBy($[0], $[1]).select([$[0], $[1].flatten()]))
data: data:
l: l:
{% for role in roles %} {% for role in roles %}
@ -696,7 +696,7 @@ resources:
{% endfor %} {% endfor %}
service_node_names: service_node_names:
yaql: yaql:
expression: dict($.data.l.where($ != null).selectMany($.items()).groupBy($[0], $[1], $.flatten())) expression: dict($.data.l.where($ != null).selectMany($.items()).groupBy($[0], $[1]).select([$[0], $[1].flatten()]))
data: data:
l: l:
{% for role in roles %} {% for role in roles %}
@ -704,7 +704,7 @@ resources:
{% endfor %} {% endfor %}
short_service_node_names: short_service_node_names:
yaql: yaql:
expression: dict($.data.l.where($ != null).selectMany($.items()).groupBy($[0], $[1], $.flatten())) expression: dict($.data.l.where($ != null).selectMany($.items()).groupBy($[0], $[1]).select([$[0], $[1].flatten()]))
data: data:
l: l:
{% for role in roles %} {% for role in roles %}
@ -712,7 +712,7 @@ resources:
{% endfor %} {% endfor %}
short_service_bootstrap_node: short_service_bootstrap_node:
yaql: yaql:
expression: dict($.data.l.where($ != null).selectMany($.items()).groupBy($[0], $[1], $.flatten().first())) expression: dict($.data.l.where($ != null).selectMany($.items()).groupBy($[0], $[1]).select([$[0], $[1].flatten().first()]))
data: data:
l: l:
{% for role in roles %} {% for role in roles %}
@ -904,7 +904,7 @@ resources:
# list of maps, but appends to colliding lists when a service # list of maps, but appends to colliding lists when a service
# is deployed on more than one role # is deployed on more than one role
yaql: yaql:
expression: dict($.data.l.where($ != null).selectMany($.items()).groupBy($[0], $[1], $.flatten())) expression: dict($.data.l.where($ != null).selectMany($.items()).groupBy($[0], $[1]).select([$[0], $[1].flatten()]))
data: data:
l: l:
{% for role in roles %} {% for role in roles %}