diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-10-31 09:39:36 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-10-31 09:39:36 +0000 |
| commit | 23e98fe884a012eb31657c00795db50c45815df5 (patch) | |
| tree | bc5d3db029c9397c2edfe7588e54445005c2eefc /manifests/haproxy.pp | |
| parent | 30b63768355a1a5701305477857ac665aa190dc9 (diff) | |
| parent | a173a030aa97ae17b457206cab3e657c28c04880 (diff) | |
Merge "Enable TLS in the internal network for ceilometer"
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 02dddf1..2508dfb 100644 --- a/manifests/haproxy.pp +++ b/manifests/haproxy.pp @@ -905,6 +905,7 @@ class tripleo::haproxy ( server_names => hiera('ceilometer_api_node_names', $controller_hosts_names_real), public_ssl_port => $ports[ceilometer_api_ssl_port], service_network => $ceilometer_network, + member_options => union($haproxy_member_options, $internal_tls_member_options), } } |