From 32b2c51a300545036d215ff376b16cdfa70aa1ce Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien.macchi@enovance.com>
Date: Wed, 5 Mar 2014 15:57:26 +0100
Subject: [PATCH 1/2] ensure keepalived starts before haproxy

It should fix a race condition where HAproxy could start before
keepalived in some cases and then the binding would fail.

bug #336
Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
---
 manifests/loadbalancer.pp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/manifests/loadbalancer.pp b/manifests/loadbalancer.pp
index 65d7b48c..d711c781 100644
--- a/manifests/loadbalancer.pp
+++ b/manifests/loadbalancer.pp
@@ -59,10 +59,9 @@ class cloud::loadbalancer(
   $galera_ip                        = $os_params::galera_ip
 ){
 
+  class { 'keepalived': } ->
   class { 'haproxy': }
 
-  class { 'keepalived': }
-
   keepalived::vrrp_script { 'haproxy':
     name_is_process => true
   }

From ca529d669749d3764cafcdb157ba8262ef86609e Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien.macchi@enovance.com>
Date: Wed, 5 Mar 2014 16:04:04 +0100
Subject: [PATCH 2/2] loadbalancer: add comment for ordering

bug #336
Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
---
 manifests/loadbalancer.pp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/manifests/loadbalancer.pp b/manifests/loadbalancer.pp
index d711c781..67e859c4 100644
--- a/manifests/loadbalancer.pp
+++ b/manifests/loadbalancer.pp
@@ -59,6 +59,7 @@ class cloud::loadbalancer(
   $galera_ip                        = $os_params::galera_ip
 ){
 
+  # Ensure Keepalived is started before HAproxy to avoid binding errors.
   class { 'keepalived': } ->
   class { 'haproxy': }