aboutsummaryrefslogtreecommitdiffstats
path: root/manifests/haproxy.pp
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-11-11 19:19:40 +0000
committerGerrit Code Review <review@openstack.org>2016-11-11 19:19:40 +0000
commitffd36a31547fcb8968b4abdc84bea32e1f23e6d4 (patch)
tree54751a7b174b27ba10f958289ec6e2d1c63b7da8 /manifests/haproxy.pp
parentb7c8e11f7b2abb77e2f7dc629165beace8e7feb2 (diff)
parentcf70097238b2bc3d17a0d592f9299be9b93046c2 (diff)
Merge "Enable TLS in the internal network for Cinder API"
Diffstat (limited to 'manifests/haproxy.pp')
-rw-r--r--manifests/haproxy.pp1
1 files changed, 1 insertions, 0 deletions
diff --git a/manifests/haproxy.pp b/manifests/haproxy.pp
index 4d96e98..5b69edd 100644
--- a/manifests/haproxy.pp
+++ b/manifests/haproxy.pp
@@ -809,6 +809,7 @@ class tripleo::haproxy (
},
public_ssl_port => $ports[cinder_api_ssl_port],
service_network => $cinder_network,
+ member_options => union($haproxy_member_options, $internal_tls_member_options),
}
}