stackforge/puppet-openstack-cloud
Code Issues Proposed changes

HAproxy / Horizon: keep header proto if using SSL in binding

Browse Source 
If using SSL forwarding for Horizon endpoint, keep the HTTPS in headers
with "X-Forwarded-Proto" parameter, using is-ssl ACL.

Closes-bug #520
This commit is contained in:
Emilien Macchi 2014-06-26 00:15:44 +02:00
parent 58fdc7dae6
commit 3b90a496fb
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/loadbalancer.pp
View File

@ -245,10 +245,17 @@ class cloud::loadbalancer(
'balance' => 'leastconn' } 'balance' => 'leastconn' }
} else { } else {
$horizon_httpchk = "httpchk GET /${horizon_auth_url} \"HTTP/1.0\\r\\nUser-Agent: HAproxy-${::hostname}\"" $horizon_httpchk = "httpchk GET /${horizon_auth_url} \"HTTP/1.0\\r\\nUser-Agent: HAproxy-${::hostname}\""
if 'ssl' in $horizon_bind_options {
$horizon_options = {
'cookie' => 'sessionid prefix',
'reqadd' => 'X-Forwarded-Proto:\ https if { ssl_fc }',
'balance' => 'leastconn' }
} else {
$horizon_options = { $horizon_options = {
'cookie' => 'sessionid prefix', 'cookie' => 'sessionid prefix',
'balance' => 'leastconn' } 'balance' => 'leastconn' }
} }
}
if $horizon_ssl_port { if $horizon_ssl_port {
warning('horizon_ssl_port parameter is deprecated. Specify port with the horizon_port instead.') warning('horizon_ssl_port parameter is deprecated. Specify port with the horizon_port instead.')
$horizon_port_real = $horizon_ssl_port $horizon_port_real = $horizon_ssl_port

1
spec/classes/cloud_loadbalancer_spec.rb
View File

@ -393,6 +393,7 @@ describe 'cloud::loadbalancer' do
'option' => ["tcpka", "forwardfor", "tcplog", "httpchk GET / \"HTTP/1.0\\r\\nUser-Agent: HAproxy-myhost\""], 'option' => ["tcpka", "forwardfor", "tcplog", "httpchk GET / \"HTTP/1.0\\r\\nUser-Agent: HAproxy-myhost\""],
'cookie' => 'sessionid prefix', 'cookie' => 'sessionid prefix',
'balance' => 'leastconn', 'balance' => 'leastconn',
'reqadd' => 'X-Forwarded-Proto:\ https if { ssl_fc }'
}, },
:bind_options => ['ssl', 'crt'] :bind_options => ['ssl', 'crt']
)} )}