openstack
/
fuel-library
Code Issues Proposed changes

Use http-server-close for glance glare service 

Change-Id: Ic74d78ffb948f15e6a7297a05ab92b67b79da962
Closes-Bug: #1590633
This commit is contained in:
Stanislaw Bogatkin 2016-12-08 20:31:57 +03:00
parent fb1e19190e
commit 0331b59169
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/puppet/openstack/manifests/ha/glance.pp
View File

@ -86,7 +86,7 @@ class openstack::ha::glance (
require_service => 'glance-glare',
haproxy_config_options => {
# TODO degorenko: check for ability for 'httpchk GET /healthcheck' for Glare
'option' => ['httpchk /versions', 'httplog', 'forceclose', 'http-buffer-request'],
'option' => ['httpchk /versions', 'httplog', 'http-server-close', 'http-buffer-request'],
'timeout' => ['server 11m', 'http-request 10s'],
'http-request' => 'set-header X-Forwarded-Proto https if { ssl_fc }',
},

2
deployment/puppet/openstack/spec/classes/openstack_ha_glance_spec.rb
View File

@ -38,7 +38,7 @@ require 'spec_helper'
'public_ssl_path' => '/var/lib/fuel/haproxy/public_glance.pem',
'require_service' => 'glance-glare',
'haproxy_config_options' => {
'option' => ['httpchk /versions', 'httplog', 'forceclose', 'http-buffer-request'],
'option' => ['httpchk /versions', 'httplog', 'http-server-close', 'http-buffer-request'],
'timeout' => ['server 11m', 'http-request 10s'],
'http-request' => 'set-header X-Forwarded-Proto https if { ssl_fc }',
},

2
tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-glance_spec.rb
View File

@ -64,7 +64,7 @@ describe manifest do
'public_ssl' => public_ssl,
'require_service' => 'glance-glare',
'haproxy_config_options' => {
'option' => ['httpchk /versions', 'httplog', 'forceclose', 'http-buffer-request'],
'option' => ['httpchk /versions', 'httplog', 'http-server-close', 'http-buffer-request'],
'timeout' => ['server 11m', 'http-request 10s'],
'http-request' => 'set-header X-Forwarded-Proto https if { ssl_fc }',
},