Do not use the 3rd argument of yaql groupBy
Due to an incompatible change in yaql, it's hard to use the aggregration
of groupBy as the behavior is completely different depending on the
version. Let's try to not rely on it.
Change-Id: I2887011f6baf4867d422579b116b5e143acf5679
Related-Bug: #1750032
(cherry picked from commit 0ddfff79ee
)
This commit is contained in:
parent
f5d35c4d73
commit
677c4c2216
@ -513,7 +513,7 @@ resources:
|
||||
# list of maps, but appends to colliding lists so we can
|
||||
# create a map of lists for all nodes for each network
|
||||
yaql:
|
||||
expression: dict($.data.where($ != null).flatten().selectMany($.items()).groupBy($[0], $[1], [$[0], $[1].flatten()]))
|
||||
expression: dict($.data.where($ != null).flatten().selectMany($.items()).groupBy($[0], $[1]).select([$[0], $[1].flatten()]))
|
||||
data:
|
||||
- {get_attr: [{{role.name}}, hostname_map]}
|
||||
|
||||
@ -665,7 +665,7 @@ resources:
|
||||
# list of maps, but appends to colliding lists when a service
|
||||
# is deployed on more than one role
|
||||
yaql:
|
||||
expression: dict($.data.l.where($ != null).selectMany($.items()).groupBy($[0], $[1], [$[0], $[1].flatten()]))
|
||||
expression: dict($.data.l.where($ != null).selectMany($.items()).groupBy($[0], $[1]).select([$[0], $[1].flatten()]))
|
||||
data:
|
||||
l:
|
||||
{% for role in roles %}
|
||||
@ -673,7 +673,7 @@ resources:
|
||||
{% endfor %}
|
||||
service_node_names:
|
||||
yaql:
|
||||
expression: dict($.data.l.where($ != null).selectMany($.items()).groupBy($[0], $[1], [$[0], $[1].flatten()]))
|
||||
expression: dict($.data.l.where($ != null).selectMany($.items()).groupBy($[0], $[1]).select([$[0], $[1].flatten()]))
|
||||
data:
|
||||
l:
|
||||
{% for role in roles %}
|
||||
@ -681,7 +681,7 @@ resources:
|
||||
{% endfor %}
|
||||
short_service_node_names:
|
||||
yaql:
|
||||
expression: dict($.data.l.where($ != null).selectMany($.items()).groupBy($[0], $[1], [$[0], $[1].flatten()]))
|
||||
expression: dict($.data.l.where($ != null).selectMany($.items()).groupBy($[0], $[1]).select([$[0], $[1].flatten()]))
|
||||
data:
|
||||
l:
|
||||
{% for role in roles %}
|
||||
@ -689,7 +689,7 @@ resources:
|
||||
{% endfor %}
|
||||
short_service_bootstrap_node:
|
||||
yaql:
|
||||
expression: dict($.data.l.where($ != null).selectMany($.items()).groupBy($[0], $[1], [$[0], $[1].flatten().first()]))
|
||||
expression: dict($.data.l.where($ != null).selectMany($.items()).groupBy($[0], $[1]).select([$[0], $[1].flatten().first()]))
|
||||
data:
|
||||
l:
|
||||
{% for role in roles %}
|
||||
@ -868,7 +868,7 @@ resources:
|
||||
# list of maps, but appends to colliding lists when a service
|
||||
# is deployed on more than one role
|
||||
yaql:
|
||||
expression: dict($.data.l.where($ != null).selectMany($.items()).groupBy($[0], $[1], [$[0], $[1].flatten()]))
|
||||
expression: dict($.data.l.where($ != null).selectMany($.items()).groupBy($[0], $[1]).select([$[0], $[1].flatten()]))
|
||||
data:
|
||||
l:
|
||||
{% for role in roles %}
|
||||
|
Loading…
Reference in New Issue
Block a user