From: Michal Skalski <mskalski@mirantis.com>
Date: Wed, 13 Apr 2016 11:15:17 +0000 (+0200)
Subject: Fix odl haproxy configuration
X-Git-Tag: brahmaputra.3.0~5
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F85%2F12285%2F1;p=fuel.git

Fix odl haproxy configuration

In rare cases ODL haproxy configuration had been deployed before
haproxy service was ready. This patch should force proper order.

Change-Id: I7c90a57bab5e3388bf29aefabe6ed9380d1303f6
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
(cherry picked from commit a71ccaa852a7a0091fce50045f29ab5119a7811b)
---

diff --git a/build/f_isoroot/f_odlpluginbuild/config.mk b/build/f_isoroot/f_odlpluginbuild/config.mk
index a94d7e215..f9666e8c2 100644
--- a/build/f_isoroot/f_odlpluginbuild/config.mk
+++ b/build/f_isoroot/f_odlpluginbuild/config.mk
@@ -8,7 +8,7 @@
 ##############################################################################
 
 ODL_BRANCH=brahmaputra-sr2
-ODL_CHANGE=b876df2345bf8c785dceea74f4c271fdfcc9563c
+ODL_CHANGE=280810a01c2a05535272df86dc599ddacd23bb78
 ODL_REPO="https://github.com/openstack/fuel-plugin-opendaylight.git"
 
 export USE_JAVA8=true