diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-11-09 13:27:01 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-11-09 13:27:01 +0000 |
commit | 311bd47d1fb6145b57d3a2dd2e96087c428751ec (patch) | |
tree | b4546ba4c86d09dbae2ac65706f35f57da8e8064 /manifests/haproxy.pp | |
parent | 7ce94fce7d18b1e814e5b5c399f8be8afb023b64 (diff) | |
parent | 7050852e22eedcb9525beeee83f965c914641e26 (diff) |
Merge "Enable TLS in the internal network for Nova API"
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 3fbd64e..4d96e98 100644 --- a/manifests/haproxy.pp +++ b/manifests/haproxy.pp @@ -897,6 +897,7 @@ class tripleo::haproxy ( }, public_ssl_port => $ports[nova_api_ssl_port], service_network => $nova_osapi_network, + member_options => union($haproxy_member_options, $internal_tls_member_options), } } |