diff options
| author |   Juan Antonio Osorio Robles <jaosorior@redhat.com> | 2017-04-25 10:39:16 +0300 |
|---|---|---|
| committer | Juan Antonio Osorio Robles <jaosorior@redhat.com> | 2017-05-02 11:51:49 +0000 |
| commit | 15fa68c680fae4d96a7239112056550539c9e3f5 (patch) | |
| tree | c1c2f5c26e25c14cb4b33974f8609e6a4ea070bb /puppet/services/haproxy.yaml | |
| parent | 386ac7791b1ed53445c059ec2b7b9f1a00222a37 (diff) | |
Use list_concat for metadata_settings for haproxy
Change-Id: Ia0e0a12e1863dce657d4e1c7f9894ea5bfd008be
Diffstat (limited to 'puppet/services/haproxy.yaml')
| -rw-r--r-- | puppet/services/haproxy.yaml | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/puppet/services/haproxy.yaml b/puppet/services/haproxy.yaml index bd5b9ef6..c651bbe5 100644 --- a/puppet/services/haproxy.yaml +++ b/puppet/services/haproxy.yaml @@ -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]} |