diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-04-05 19:53:07 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-04-05 19:53:07 +0000 |
| commit | da8f651cd4ad54b12d6a208ce837df5d95605f91 (patch) | |
| tree | fd9cfa9ed6fbe8b074c746c63571b4f68c1d68d6 /manifests/haproxy.pp | |
| parent | ed9c09bb1efd2f73ee5ab1a85262071c1ca386b8 (diff) | |
| parent | 52925ba9cf329a7f029ca7ed196071b29d69ac08 (diff) | |
Merge "Add TLS in the internal network for Swift Proxy"
Diffstat (limited to 'manifests/haproxy.pp')
| -rw-r--r-- | manifests/haproxy.pp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/manifests/haproxy.pp b/manifests/haproxy.pp index e5d57e5..0b69245 100644 --- a/manifests/haproxy.pp +++ b/manifests/haproxy.pp @@ -1236,6 +1236,7 @@ class tripleo::haproxy ( listen_options => $swift_proxy_server_listen_options, public_ssl_port => $ports[swift_proxy_ssl_port], service_network => $swift_proxy_server_network, + member_options => union($haproxy_member_options, $internal_tls_member_options), } } |