diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-03-10 20:42:56 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-03-10 20:42:56 +0000 |
commit | 64b419f4a47646b98586bcb9751564e82585274b (patch) | |
tree | a765894264bd5afbe6c211b79de5404c5c4186c3 /manifests/haproxy.pp | |
parent | d73c2630b534b277122db68620be8923c4d3a6b4 (diff) | |
parent | d82a7c50c25fd760786b76ef0593c75477496189 (diff) |
Merge "Deploy Heat APIs over httpd"
Diffstat (limited to 'manifests/haproxy.pp')
-rw-r--r-- | manifests/haproxy.pp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/manifests/haproxy.pp b/manifests/haproxy.pp index 13d4ba5..517df4b 100644 --- a/manifests/haproxy.pp +++ b/manifests/haproxy.pp @@ -1265,6 +1265,7 @@ class tripleo::haproxy ( listen_options => $heat_options, public_ssl_port => $ports[heat_api_ssl_port], service_network => $heat_api_network, + member_options => union($haproxy_member_options, $internal_tls_member_options), } } @@ -1279,6 +1280,7 @@ class tripleo::haproxy ( listen_options => $heat_options, public_ssl_port => $ports[heat_cw_ssl_port], service_network => $heat_cloudwatch_network, + member_options => union($haproxy_member_options, $internal_tls_member_options), } } @@ -1293,6 +1295,7 @@ class tripleo::haproxy ( listen_options => $heat_options, public_ssl_port => $ports[heat_cfn_ssl_port], service_network => $heat_cfn_network, + member_options => union($haproxy_member_options, $internal_tls_member_options), } } |