diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-01-27 01:07:11 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-01-27 01:07:11 +0000 |
| commit | d427c2a326194c1612844d1509b8f1216ac98cf6 (patch) | |
| tree | 41e1128ae488c9054e3246ebaa50469cdf9efa5d /manifests/haproxy.pp | |
| parent | 4d356ed4ae5e609bf4ffc9a1729690e0b0c6df22 (diff) | |
| parent | 033e1f360025c9409d7e840b48a64c8814c3a1bd (diff) | |
Merge "Use TLS proxy for neutron server's internal TLS"
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 e90b0fb..f34c58f 100644 --- a/manifests/haproxy.pp +++ b/manifests/haproxy.pp @@ -875,6 +875,7 @@ class tripleo::haproxy ( }, public_ssl_port => $ports[neutron_api_ssl_port], service_network => $neutron_network, + member_options => union($haproxy_member_options, $internal_tls_member_options), } } |