Merge pull request #10544 from marun/bz/1368525

Merged by openshift-bot
openshift · Aug 19, 2016 · 64c2e37 · 64c2e37
2 parents 161c470 + bf1e620
commit 64c2e37
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/images/router/haproxy/conf/haproxy-config.template b/images/router/haproxy/conf/haproxy-config.template
@@ -288,11 +288,7 @@ backend be_edge_http_{{$cfgIdx}}
   http-request set-header X-Forwarded-Port %[dst_port]
   http-request set-header X-Forwarded-Proto http if !{ ssl_fc }
   http-request set-header X-Forwarded-Proto https if { ssl_fc }
-  {{ if (eq $cfg.TLSTermination "") }}
-    cookie {{$cfg.RoutingKeyName}} insert indirect nocache httponly
-  {{ else }}
-  cookie {{$cfg.RoutingKeyName}} insert indirect nocache httponly secure
-  {{ end }}
+  cookie {{$cfg.RoutingKeyName}} insert indirect nocache httponly
   http-request set-header Forwarded for=%[src];host=%[req.hdr(host)];proto=%[req.hdr(X-Forwarded-Proto)]
     {{ range $serviceUnitName, $weight := $cfg.ServiceUnitNames }}
       {{ if ne $weight 0 }}