Filter null/None service names

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

diff --git a/puppet/services/services.yaml b/puppet/services/services.yaml
index 7ed880f..c9a952a 100644 (file)
--- a/puppet/services/services.yaml
+++ b/puppet/services/services.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2016-04-08
+heat_template_version: 2016-10-14
 
 description: >
   Utility stack to convert an array of services into a set of combined
@@ -27,9 +27,14 @@ resources:
         EndpointMap: {get_param: EndpointMap}
 
 outputs:
-  config_settings:
-    description: Configuration settings.
-    value: {map_merge: {get_attr: [ServiceChain, role_data, config_settings]}}
-  step_config:
-    description: Step configuration.
-    value: {list_join: ["\n", {get_attr: [ServiceChain, role_data, step_config]}]}
+  role_data:
+    description: Combined Role data for this set of services.
+    value:
+      service_names:
+        # Filter any null/None service_names which may be present due to mapping
+        # of services to OS::Heat::None
+        yaql:
+          expression: list($.data.s_names.where($ != null))
+          data: {s_names: {get_attr: [ServiceChain, role_data, service_name]}}
+      config_settings: {map_merge: {get_attr: [ServiceChain, role_data, config_settings]}}
+      step_config: {list_join: ["\n", {get_attr: [ServiceChain, role_data, step_config]}]}