Merge "Fix incorrect SSL redirect" into stable/mitaka
This commit is contained in:
commit
7a9393bfb0
@ -55,9 +55,9 @@ class openstack::ha::horizon (
|
||||
server_names => undef,
|
||||
ipaddresses => undef,
|
||||
haproxy_config_options => {
|
||||
'option' => 'http-buffer-request',
|
||||
'timeout' => 'http-request 10s',
|
||||
'redirect' => 'scheme https if !{ ssl_fc }'
|
||||
'option' => 'http-buffer-request',
|
||||
'timeout' => 'http-request 10s',
|
||||
'http-request' => 'redirect location https://%[req.hdr(Host)]/horizon',
|
||||
},
|
||||
}
|
||||
|
||||
|
@ -33,9 +33,9 @@ describe manifest do
|
||||
'server_names' => nil,
|
||||
'ipaddresses' => nil,
|
||||
'haproxy_config_options' => {
|
||||
'option' => 'http-buffer-request',
|
||||
'timeout' => 'http-request 10s',
|
||||
'redirect' => 'scheme https if !{ ssl_fc }'
|
||||
'option' => 'http-buffer-request',
|
||||
'timeout' => 'http-request 10s',
|
||||
'http-request' => 'redirect location https://%[req.hdr(Host)]/horizon',
|
||||
}
|
||||
)
|
||||
should_not contain_haproxy__balancermember('horizon')
|
||||
|
Loading…
Reference in New Issue
Block a user