diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-06-30 11:27:06 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-06-30 11:27:06 +0000 |
| commit | d5582dd84bb0df561132e258f3dbdd16b42eb676 (patch) | |
| tree | b1db945addfc34cc81cde29722a4338a43a657b3 /manifests | |
| parent | 096e913306584baaf0fd2e7bb4951ecb23f370ac (diff) | |
| parent | 90eed9d6a01000377eeadddb07a9e8d57163fe17 (diff) | |
Merge "Merge the nova HAproxy TLS options"
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/haproxy.pp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/manifests/haproxy.pp b/manifests/haproxy.pp index 2f29674..e12ae77 100644 --- a/manifests/haproxy.pp +++ b/manifests/haproxy.pp @@ -1048,7 +1048,7 @@ class tripleo::haproxy ( mode => 'http', public_ssl_port => $ports[nova_api_ssl_port], service_network => $nova_osapi_network, - #member_options => union($haproxy_member_options, $internal_tls_member_options), + member_options => union($haproxy_member_options, $internal_tls_member_options), } } |