openstack/fuel-library
Code Issues Proposed changes

Change apache api proxy config to disallow keepalives for OSTF

Browse Source 
Sahara API does not support keepalive connections correctly, so it is
necessary to disable this feature. It is already disabled for HAProxy,
but in case with OSTF tests there is Apache working as another proxy
between admin and public network, so we should disable keepalives for
it too. In other case there is cases when client tries to reuse
connection for HTTPS request and fails to do it.

Closes-Bug: #1533218
Change-Id: I9cb4f69e49c8aa71b861e2cc1ee285f6d23dc4c1
Co-Authored-By: Dmitry Bilunov <dbilunov@mirantis.com>
This commit is contained in:
Stanislaw Bogatkin 2016-01-15 13:07:47 +03:00
parent 539db08fa8
commit bbd082b140
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
deployment/puppet/osnailyfacter/manifests/apache_api_proxy.pp
View File

@ -25,6 +25,7 @@ class osnailyfacter::apache_api_proxy(
class {"::apache::mod::proxy": }
class {"::apache::mod::proxy_connect": }
class {"::apache::mod::proxy_http": }
class {"::apache::mod::headers": }
$apache_api_proxy_address = hiera('apache_api_proxy_address', '0.0.0.0')

4
deployment/puppet/osnailyfacter/templates/api_proxy.conf.erb
View File

@ -3,6 +3,10 @@
AllowCONNECT 443 563 5000 6385 8000 8003 8004 8080 8082 8386 8773 8774 8776 8777 9292 9696
HostnameLookups off
LimitRequestFieldSize <%= @max_header_size %>
SetEnv force-proxy-request-1.0 1
SetEnv proxy-nokeepalive 1
RequestHeader unset Expect early
RequestReadTimeout header=0,MinRate=500 body=0,MinRate=500
<Proxy *>
Order Deny,Allow
<% if @master_ip.kind_of?(Array) -%>

7
tests/noop/spec/hosts/api-proxy/api-proxy_spec.rb
View File

@ -54,6 +54,10 @@ describe manifest do
AllowCONNECT 443 563 5000 6385 8000 8003 8004 8080 8082 8386 8773 8774 8776 8777 9292 9696
HostnameLookups off
LimitRequestFieldSize 81900
SetEnv force-proxy-request-1.0 1
SetEnv proxy-nokeepalive 1
RequestHeader unset Expect early
RequestReadTimeout header=0,MinRate=500 body=0,MinRate=500
<Proxy *>
Order Deny,Allow
Allow from #{master_ip}
@ -64,6 +68,9 @@ describe manifest do
)
end
it 'should declare apache::mod::headers' do
should contain_class('apache::mod::headers')
end
end
test_ubuntu_and_centos manifest