openstack
/
fuel-library
Code Issues Proposed changes

Merge "Fix incorrect SSL redirect" into stable/mitaka

This commit is contained in:
Jenkins 2017-07-03 12:06:55 +00:00 committed by Gerrit Code Review
parent 81274177d6 217f83bf74
commit 7a9393bfb0
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
deployment/puppet/openstack/manifests/ha/horizon.pp
View File

@ -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',
},
}

6
tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-horizon_spec.rb
View File

@ -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')