diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-05-02 17:58:01 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-05-02 17:58:01 +0000 |
| commit | b36b86d8cd27f31a31b0b286e0b302579b44a11e (patch) | |
| tree | d87d4c5b471ed4423926bc14353a284074f120c5 /puppet | |
| parent | 903778a8684bc8d314078e3afa73cf74d38f2910 (diff) | |
| parent | 15fa68c680fae4d96a7239112056550539c9e3f5 (diff) | |
Merge "Use list_concat for metadata_settings for haproxy"
Diffstat (limited to 'puppet')
| -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]} |