openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Tolerate missing keys from role_data in service templates"

This commit is contained in:
Jenkins 2016-09-23 11:35:10 +00:00 committed by Gerrit Code Review
parent 4f3e771375 a99c06aa96
commit f9d6db86ed
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
puppet/services/services.yaml
View File

@ -54,8 +54,8 @@ outputs:
data: {s_names: {get_attr: [ServiceChain, role_data, service_name]}}
monitoring_subscriptions:
yaql:
expression: list($.data.subscriptions.where($ != null))
data: {subscriptions: {get_attr: [ServiceChain, role_data, monitoring_subscription]}}
expression: list($.data.where($ != null).select($.get('monitoring_subscription')).where($ != null))
data: {get_attr: [ServiceChain, role_data]}
logging_sources:
# Transform the individual logging_source configuration from
# each service in the chain into a global list, adding some
@ -77,7 +77,9 @@ outputs:
data:
sources:
- {get_attr: [LoggingConfiguration, LoggingDefaultSources]}
- {get_attr: [ServiceChain, role_data, logging_source]}
- yaql:
expression: list($.data.where($ != null).select($.get('logging_sources')).where($ != null))
data: {get_attr: [ServiceChain, role_data]}
- {get_attr: [LoggingConfiguration, LoggingExtraSources]}
default_format: {get_attr: [LoggingConfiguration, LoggingDefaultFormat]}
pos_file_path: {get_attr: [LoggingConfiguration, LoggingPosFilePath]}
@ -90,12 +92,14 @@ outputs:
data:
groups:
- [{get_attr: [LoggingConfiguration, LoggingDefaultGroups]}]
- {get_attr: [ServiceChain, role_data, logging_groups]}
- yaql:
expression: list($.data.where($ != null).select($.get('logging_groups')).where($ != null))
data: {get_attr: [ServiceChain, role_data]}
- [{get_attr: [LoggingConfiguration, LoggingExtraGroups]}]
config_settings: {map_merge: {get_attr: [ServiceChain, role_data, config_settings]}}
global_config_settings:
map_merge:
yaql:
expression: list($.data.configs.where($ != null))
data: {configs: {get_attr: [ServiceChain, role_data, global_config_settings]}}
expression: list($.data.where($ != null).select($.get('global_config_settings')).where($ != null))
data: {get_attr: [ServiceChain, role_data]}
step_config: {list_join: ["\n", {get_attr: [ServiceChain, role_data, step_config]}]}