summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-10 15:09:28 +0000
committerGerrit Code Review <review@openstack.org>2017-04-10 15:09:28 +0000
commit8bcd1ed1109c631219638bc40b856940b8017e42 (patch)
treedd5c0262b30417a2df22963ca5b26b2e85c196c9 /puppet
parent3a624e6fc169d80c0df1fefdb0da1d1946da2ad2 (diff)
parent687c53a05a3045e7d889ddb17bca2eda0151d8a2 (diff)
Merge "Remove yaql call when building logging_groups"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/services/services.yaml11
1 files changed, 4 insertions, 7 deletions
diff --git a/puppet/services/services.yaml b/puppet/services/services.yaml
index a2286d16..9820b431 100644
--- a/puppet/services/services.yaml
+++ b/puppet/services/services.yaml
@@ -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: