diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-04-25 17:33:53 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-04-25 17:33:53 +0000 |
commit | baecff6c3ca47400ace7fb6ef5a83cd0a206041a (patch) | |
tree | b5f7f850ad31af7a55eb5371b849fe1acedadc45 /manifests/haproxy.pp | |
parent | 03828da512f0260b7f94e5edb9a9916b6187fbbb (diff) | |
parent | 60d187ee0bc87c33e4b6e4d79983089157ce7565 (diff) |
Merge "Enable internal network TLS for etcd"
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 ad7b954..a449a49 100644 --- a/manifests/haproxy.pp +++ b/manifests/haproxy.pp @@ -1373,6 +1373,7 @@ class tripleo::haproxy ( ip_addresses => hiera('etcd_node_ips', $controller_hosts_real), server_names => hiera('etcd_node_names', $controller_hosts_names_real), service_network => $etcd_network, + member_options => union($haproxy_member_options, $internal_tls_member_options), listen_options => { 'balance' => 'source', } |