From 755851c93889b92e10a9dbddc6f591a7bc6ec01a Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien.macchi@enovance.com>
Date: Thu, 7 Aug 2014 10:54:43 +0200
Subject: [PATCH] loadbalancer: use TCP checks for Spice

It seems that HTTP checks may make fail the spice console proxy service.
Let's use TCP only to avoid this failure.
Closes-bug #561
---
 manifests/loadbalancer.pp               | 4 +++-
 spec/classes/cloud_loadbalancer_spec.rb | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/manifests/loadbalancer.pp b/manifests/loadbalancer.pp
index 3c6768d6..e25b235d 100644
--- a/manifests/loadbalancer.pp
+++ b/manifests/loadbalancer.pp
@@ -373,11 +373,13 @@ class cloud::loadbalancer(
     port               => $spice_port,
     options            => {
       'balance'        => 'leastconn',
+      'mode'           => 'tcp',
+      'option'         => ['tcpka', 'forwardfor', 'tcplog',],
+      'http-check'     => '',
       'timeout server' => '120m',
       'timeout client' => '120m',
     },
     bind_options       => $spice_bind_options,
-    httpchk            => 'httpchk GET /';
   }
   cloud::loadbalancer::binding { 'trove_api_cluster':
     ip           => $trove_api,
diff --git a/spec/classes/cloud_loadbalancer_spec.rb b/spec/classes/cloud_loadbalancer_spec.rb
index d2b48161..e9f33921 100644
--- a/spec/classes/cloud_loadbalancer_spec.rb
+++ b/spec/classes/cloud_loadbalancer_spec.rb
@@ -209,10 +209,10 @@ describe 'cloud::loadbalancer' do
         :ipaddress => [params[:vip_public_ip]],
         :ports     => '6082',
         :options   => {
-          'mode'           => 'http',
-          'option'         => ['tcpka', 'forwardfor', 'tcplog','httpchk GET /'],
-          'http-check'     => 'expect ! rstatus ^5',
+          'mode'           => 'tcp',
+          'option'         => ['tcpka', 'forwardfor', 'tcplog'],
           'balance'        => 'leastconn',
+          'http-check'     => '',
           'timeout server' => '120m',
           'timeout client' => '120m'
         }