openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Use list_concat for metadata_settings for haproxy"

This commit is contained in:
Jenkins 2017-05-02 17:58:01 +00:00 committed by Gerrit Code Review
parent 903778a868 15fa68c680
commit b36b86d8cd
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
puppet/services/haproxy.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
description: >
HAproxy service configured with Puppet
@ -96,8 +96,6 @@ outputs:
when: haproxy_enabled.rc == 0
service: name=haproxy state=started
metadata_settings:
yaql:
expression: '[].concat(coalesce($.data.internal, []), coalesce($.data.public, []))'
data:
public: {get_attr: [HAProxyPublicTLS, role_data, metadata_settings]}
internal: {get_attr: [HAProxyInternalTLS, role_data, metadata_settings]}
list_concat:
- {get_attr: [HAProxyPublicTLS, role_data, metadata_settings]}
- {get_attr: [HAProxyInternalTLS, role_data, metadata_settings]}