Merge "Be more inclusive in insecure registry regex"

[apex-tripleo-heat-templates.git] / puppet / services / services.yaml

diff --git a/puppet/services/services.yaml b/puppet/services/services.yaml
index c8d5642..176fd23 100644 (file)
--- a/puppet/services/services.yaml
+++ b/puppet/services/services.yaml
@@ -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_source')).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,18 @@ 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]}
+      service_config_settings:
+        yaql:
+          expression: $.data.where($ != null).select($.get('service_config_settings')).where($ != null).reduce($1.mergeWith($2), {})
+          data: {get_attr: [ServiceChain, role_data]}
       step_config: {list_join: ["\n", {get_attr: [ServiceChain, role_data, step_config]}]}