summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-14 09:43:03 +0000
committerGerrit Code Review <review@openstack.org>2017-06-14 09:43:03 +0000
commitbf48a735ca43eadfd0c1150f8789971184b8f56b (patch)
treed2380caf6bd15134c25ceced5ef702e2f8640f06
parent2561fa9560e80e6f6cf9c6c1f1424491cfb012d9 (diff)
parent2606a4e66fa2802de604d56ade018119bebd79cc (diff)
Merge "Remove condition to match hdr(host) in haproxy redirect rule"
-rw-r--r--manifests/haproxy.pp2
1 files changed, 1 insertions, 1 deletions
diff --git a/manifests/haproxy.pp b/manifests/haproxy.pp
index 208f328..98c9c96 100644
--- a/manifests/haproxy.pp
+++ b/manifests/haproxy.pp
@@ -780,7 +780,7 @@ class tripleo::haproxy (
'cookie' => 'SERVERID insert indirect nocache',
'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 }",
+ 'redirect' => 'scheme https code 301 if !{ ssl_fc }',
'option' => [ 'forwardfor', 'httpchk' ],
'http-request' => [
'set-header X-Forwarded-Proto https if { ssl_fc }',