aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-09-13 15:00:05 +0000
committerGerrit Code Review <review@openstack.org>2016-09-13 15:00:05 +0000
commite61e8f6330f43063f5c49fa8b1fe3a88f59db175 (patch)
tree2f8f6af3f2c2ff9b8a2f9053126a23299a38e835
parent3f2ffe31b5d63d84b3a5c48d3d7607bc3b1b830e (diff)
parentad5182f6323065eb45f9168db9e9e52b801f625b (diff)
Merge "Enable X-Forwarded-Proto for manila"
-rw-r--r--manifests/haproxy.pp5
1 files changed, 5 insertions, 0 deletions
diff --git a/manifests/haproxy.pp b/manifests/haproxy.pp
index e1f5d50..6044eba 100644
--- a/manifests/haproxy.pp
+++ b/manifests/haproxy.pp
@@ -593,6 +593,11 @@ class tripleo::haproxy (
service_port => $ports[manila_api_port],
ip_addresses => hiera('manila_api_node_ips', $controller_hosts_real),
server_names => $controller_hosts_names_real,
+ listen_options => {
+ 'http-request' => [
+ 'set-header X-Forwarded-Proto https if { ssl_fc }',
+ 'set-header X-Forwarded-Proto http if !{ ssl_fc }'],
+ },
public_ssl_port => $ports[manila_api_ssl_port],
}
}