openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Remove yaql call when building logging_groups"

This commit is contained in:
Jenkins 2017-04-10 15:09:28 +00:00 committed by Gerrit Code Review
parent 3a624e6fc1 687c53a05a
commit 8bcd1ed110
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
puppet/services/services.yaml
View File

@ -90,14 +90,11 @@ outputs:
# fluentd user.
yaql:
expression: >
set($.data.groups.flatten()).where($)
set(($.data.default + $.data.extra + $.data.role_data.where($ != null).select($.get('logging_groups'))).flatten()).where($)
data:
groups:
- [{get_attr: [LoggingConfiguration, LoggingDefaultGroups]}]
- yaql:
expression: list($.data.role_data.where($ != null).select($.get('logging_groups')).where($ != null))
data: {role_data: {get_attr: [ServiceChain, role_data]}}
- [{get_attr: [LoggingConfiguration, LoggingExtraGroups]}]
default: {get_attr: [LoggingConfiguration, LoggingDefaultGroups]}
extra: {get_attr: [LoggingConfiguration, LoggingExtraGroups]}
role_data: {get_attr: [ServiceChain, role_data]}
config_settings: {map_merge: {get_attr: [ServiceChain, role_data, config_settings]}}
global_config_settings:
map_merge: