summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-07-29 13:00:43 +0000
committerGerrit Code Review <review@openstack.org>2016-07-29 13:00:43 +0000
commit4070a03cb41fd84530591a8774f66fa05c7900bf (patch)
treeadb2f55ca3bb6a233c3014a9e343ccd976559f72
parent569e73ff758d58d4f3ece707b259f0b2926dcf9c (diff)
parent23e13cc1e0b71847e0ea2504c40addaa435f0bef (diff)
Merge "Filter null/None service names"
-rw-r--r--puppet/services/services.yaml9
1 files changed, 7 insertions, 2 deletions
diff --git a/puppet/services/services.yaml b/puppet/services/services.yaml
index 64a0f985..c9a952a5 100644
--- 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
@@ -30,6 +30,11 @@ outputs:
role_data:
description: Combined Role data for this set of services.
value:
- service_names: {get_attr: [ServiceChain, role_data, service_name]}
+ 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]}]}