summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-04-21 14:53:30 +0000
committerGerrit Code Review <review@openstack.org>2016-04-21 14:53:30 +0000
commitb275638c355d6f9091df413d2b2be906ca7f3559 (patch)
treeaa97181dc31ef7dec81b4d103607443c7d22d196
parentc0f6af6527ee308dddf6f2b1c91ba635a4b2e2e6 (diff)
parent96058c80cb2236d5549c366aa6d2c66d39d86d8b (diff)
Merge "Enable HAProxy forwardfor option for Horizon."
-rw-r--r--manifests/loadbalancer.pp2
1 files changed, 2 insertions, 0 deletions
diff --git a/manifests/loadbalancer.pp b/manifests/loadbalancer.pp
index e91e611..664590b 100644
--- a/manifests/loadbalancer.pp
+++ b/manifests/loadbalancer.pp
@@ -520,6 +520,7 @@ class tripleo::loadbalancer (
'rsprep' => '^Location:\ http://(.*) Location:\ https://\1',
# NOTE(jaosorior): We always redirect to https for the public_virtual_ip.
'redirect' => "scheme https code 301 if { hdr(host) -i ${public_virtual_ip} } !{ ssl_fc }",
+ 'option' => 'forwardfor',
}
} else {
$horizon_bind_opts = {
@@ -528,6 +529,7 @@ class tripleo::loadbalancer (
}
$horizon_options = {
'cookie' => 'SERVERID insert indirect nocache',
+ 'option' => 'forwardfor',
}
}