diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-11-08 16:19:48 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-11-08 16:19:48 +0000 |
commit | c326036cfc3945a410d1f16d005d1b84f28ac83a (patch) | |
tree | 8f26240feb88fcb2c91eb65e1877911a4c2da96e /manifests/haproxy.pp | |
parent | 4d6b55c699baced5a64476be1a4ca9dba11f8a6b (diff) | |
parent | 9f9a6db9fc479355ee67ec45f170b77de56a1bdb (diff) |
Merge "Enable TLS in the internal network for gnocchi"
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 99c9205..644f1fd 100644 --- a/manifests/haproxy.pp +++ b/manifests/haproxy.pp @@ -966,6 +966,7 @@ class tripleo::haproxy ( server_names => hiera('gnocchi_api_node_names', $controller_hosts_names_real), public_ssl_port => $ports[gnocchi_api_ssl_port], service_network => $gnocchi_network, + member_options => union($haproxy_member_options, $internal_tls_member_options), } } |