X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=inline;f=puppet%2Fservices%2Fservices.yaml;h=c9a952a53a5ce1d424d20c210a85b5745c898979;hb=23e13cc1e0b71847e0ea2504c40addaa435f0bef;hp=91f0e049c56dac3998ce85babf55f52ded814fcc;hpb=a70464cd0d03c785bf9e87ba842f1a68aaa7a511;p=apex-tripleo-heat-templates.git diff --git a/puppet/services/services.yaml b/puppet/services/services.yaml index 91f0e049..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,5 +30,11 @@ outputs: 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]}]}