diff options
| author |   Steven Hardy <shardy@redhat.com> | 2016-07-27 11:51:30 +0100 |
|---|---|---|
| committer | Steven Hardy <shardy@redhat.com> | 2016-07-27 17:04:59 +0100 |
| commit | 23e13cc1e0b71847e0ea2504c40addaa435f0bef (patch) | |
| tree | e055ec537dacce5a8378d0ab7b80161cd9c262cb | |
| parent | fc93cf3e2965f430b243eda1e95ce30c4e59a1ab (diff) | |
Filter null/None service names
To enable use of the service_names lists in overcloud.yaml we need
to strip any null/None values or list processing becomes cumbersome.
These happen because we're currently disabling some services via
OS::Heat::None in the resource_registry, it may be possible to remove
when we've got a fully composable approach to generating the
*Services lists.
Change-Id: I8ef53b4279d93850c207c73aab0d75095a2497a2
Partially-Implements: blueprint custom-roles
| -rw-r--r-- | puppet/services/services.yaml | 9 |
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]}]} |