X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fservices.yaml;h=0e7b6d2b36e4af50797a10cb779c7b84a22b2180;hb=3c9aa3543b221a16cbe8a5cfce32e8a080f69e92;hp=a2286d16862551032affd02afaaedc437339960d;hpb=ad2ea290bed17bff9b53ac225d3604ed642ee8bc;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/services.yaml b/puppet/services/services.yaml
index a2286d16..0e7b6d2b 100644
--- a/puppet/services/services.yaml
+++ b/puppet/services/services.yaml
@@ -1,4 +1,4 @@
-heat_template_version: ocata
+heat_template_version: pike
 
 description: >
   Utility stack to convert an array of services into a set of combined
@@ -26,6 +26,14 @@ parameters:
     description: Mapping of service -> default password. Used to help
                  pass top level passwords managed by Heat into services.
     type: json
+  RoleName:
+    default: ''
+    description: Role name on which the service is applied
+    type: string
+  RoleParameters:
+    description: Role Specific parameters to be provided to service
+    default: {}
+    type: json
 
 resources:
 
@@ -38,6 +46,8 @@ resources:
         ServiceNetMap: {get_param: ServiceNetMap}
         EndpointMap: {get_param: EndpointMap}
         DefaultPasswords: {get_param: DefaultPasswords}
+        RoleName: {get_param: RoleName}
+        RoleParameters: {get_param: RoleParameters}
 
   LoggingConfiguration:
     type: OS::TripleO::LoggingConfiguration
@@ -90,14 +100,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: