stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Revert "loadbalancer: use TCP checks for Spice"

Browse Source 
This patch breaks HAproxy to start:
[ALERT] 230/085911 (53231) : parsing [/etc/haproxy/haproxy.cfg:235] :
'http-check' only supports 'disable-on-404', 'send-state', 'expect'.

This reverts commit 755851c93889b92e10a9dbddc6f591a7bc6ec01a.
This commit is contained in:
Emilien Macchi 2014-08-19 10:58:52 +02:00
parent ed49a5e550
commit eef178e01c
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/loadbalancer.pp
View File

@ -373,13 +373,11 @@ class cloud::loadbalancer(
port => $spice_port, port => $spice_port,
options => { options => {
'balance' => 'leastconn', 'balance' => 'leastconn',
'mode' => 'tcp',
'option' => ['tcpka', 'forwardfor', 'tcplog',],
'http-check' => '',
'timeout server' => '120m', 'timeout server' => '120m',
'timeout client' => '120m', 'timeout client' => '120m',
}, },
bind_options => $spice_bind_options, bind_options => $spice_bind_options,
httpchk => 'httpchk GET /';
} }
cloud::loadbalancer::binding { 'trove_api_cluster': cloud::loadbalancer::binding { 'trove_api_cluster':
ip => $trove_api, ip => $trove_api,

6
spec/classes/cloud_loadbalancer_spec.rb
View File

@ -209,10 +209,10 @@ describe 'cloud::loadbalancer' do
:ipaddress => [params[:vip_public_ip]], :ipaddress => [params[:vip_public_ip]],
:ports => '6082', :ports => '6082',
:options => { :options => {
'mode' => 'tcp', 'mode' => 'http',
'option' => ['tcpka', 'forwardfor', 'tcplog'], 'option' => ['tcpka', 'forwardfor', 'tcplog','httpchk GET /'],
'http-check' => 'expect ! rstatus ^5',
'balance' => 'leastconn', 'balance' => 'leastconn',
'http-check' => '',
'timeout server' => '120m', 'timeout server' => '120m',
'timeout client' => '120m' 'timeout client' => '120m'
} }