diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-11-15 18:21:14 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-11-15 18:21:14 +0000 |
| commit | 6661cefcc4ce560318b2b4403f6fafbabf8e1853 (patch) | |
| tree | 88df70292e80b38c4e4c2c448ce2dd9b9711f5ef /manifests/haproxy.pp | |
| parent | d7f4f3efbf97a96da303a503884a35b5a2ef723e (diff) | |
| parent | 6e78c2f19afbaf513e6f8d936aed76daedadb947 (diff) | |
Merge " Enable TLS in the internal network for Barbican API"
Diffstat (limited to 'manifests/haproxy.pp')
| -rw-r--r-- | manifests/haproxy.pp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/manifests/haproxy.pp b/manifests/haproxy.pp index e0a8de8..2cd69c5 100644 --- a/manifests/haproxy.pp +++ b/manifests/haproxy.pp @@ -972,7 +972,8 @@ class tripleo::haproxy ( ip_addresses => hiera('barbican_api_node_ips', $controller_hosts_real), server_names => hiera('barbican_api_node_names', $controller_hosts_names_real), public_ssl_port => $ports[barbican_api_ssl_port], - service_network => $barbican_network + service_network => $barbican_network, + member_options => union($haproxy_member_options, $internal_tls_member_options), } } |