X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fservices.yaml;h=97f87061828d4dba0eaba26ccc2abe98c3c8ab7d;hb=db45116afdd0c7673c5839122dadf570303d1e4b;hp=c8d5642c59e66f41409d516c5688bc6b2d2b24c4;hpb=dc9c4c2ad9f8ee08d3b97f09641f580bb32c1592;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/services.yaml b/puppet/services/services.yaml
index c8d5642c..97f87061 100644
--- a/puppet/services/services.yaml
+++ b/puppet/services/services.yaml
@@ -42,6 +42,11 @@ resources:
   LoggingConfiguration:
     type: OS::TripleO::LoggingConfiguration
 
+  ServiceServerMetadataHook:
+    type: OS::TripleO::ServiceServerMetadataHook
+    properties:
+      RoleData: {get_attr: [ServiceChain, role_data]}
+
 outputs:
   role_data:
     description: Combined Role data for this set of services.
@@ -54,8 +59,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.role_data.where($ != null).select($.get('monitoring_subscription')).where($ != null))
+          data: {role_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 +82,10 @@ outputs:
           data:
             sources:
               - {get_attr: [LoggingConfiguration, LoggingDefaultSources]}
-              - {get_attr: [ServiceChain, role_data, logging_source]}
+              - yaql:
+                  expression: list($.data.role_data.where($ != null).select($.get('logging_source')).where($ != null))
+                  data: {role_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 +98,24 @@ outputs:
           data:
             groups:
               - [{get_attr: [LoggingConfiguration, LoggingDefaultGroups]}]
-              - {get_attr: [ServiceChain, role_data, logging_groups]}
+              - 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]}]
       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.role_data.where($ != null).select($.get('global_config_settings')).where($ != null))
+            data: {role_data: {get_attr: [ServiceChain, role_data]}}
+      service_config_settings:
+        yaql:
+          expression: $.data.role_data.where($ != null).select($.get('service_config_settings')).where($ != null).reduce($1.mergeWith($2), {})
+          data: {role_data: {get_attr: [ServiceChain, role_data]}}
       step_config: {list_join: ["\n", {get_attr: [ServiceChain, role_data, step_config]}]}
+      upgrade_tasks:
+        yaql:
+          # Note we use distinct() here to filter any identical tasks, e.g yum update for all services
+          expression: $.data.where($ != null).select($.get('upgrade_tasks')).where($ != null).flatten().distinct()
+          data: {get_attr: [ServiceChain, role_data]}
+      service_metadata_settings: {get_attr: [ServiceServerMetadataHook, metadata]}