From fb6813974d9aa81e71b7cb0a26a441ad1d106871 Mon Sep 17 00:00:00 2001
From: Michael Prokop <mprokop@sipwise.com>
Date: Mon, 4 Jul 2011 13:17:12 +0000
Subject: [PATCH] Disable bonding by default and provide option "ngcpbonding"
 to enable it on request. Adjust installer params for HA v2 setup.

From: Michael Prokop <mprokop@sipwise.com>
---
 deployment.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/deployment.sh b/deployment.sh
index 559bf1c..6ea1f25 100755
--- a/deployment.sh
+++ b/deployment.sh
@@ -30,7 +30,7 @@ INTERACTIVE=false
 LOCAL_MIRROR=false
 DHCP=false
 LOGO=true
-BONDING=true
+BONDING=false
 USE_LOCAL_MIRROR=true
 LINUX_HA3=false
 export DISK=sda # will be configured as /dev/sda
@@ -105,6 +105,10 @@ if checkBootParam ngcpnobonding ; then
   BONDING=false
 fi
 
+if checkBootParam ngcpbonding ; then
+  BONDING=true
+fi
+
 if checkBootParam nolocalmirror ; then
   USE_LOCAL_MIRROR=false
 fi
@@ -262,6 +266,7 @@ for param in $* ; do
     *ngcpnw.dhcp*) export DHCP=true;;
     *ngcphav3*) LINUX_HA3=true; PRO_EDITION=true;;
     *ngcpnobonding*) BONDING=false;;
+    *ngcpbonding*) BONDING=true;;
   esac
   shift
 done
@@ -605,7 +610,7 @@ if "$NGCP_INSTALLER" ; then
 PKG=ngcp-installer-latest.deb
 wget http://deb.sipwise.com/sppro/\$PKG
 dpkg -i \$PKG
-ngcp-installer \$ROLE \$IP1 \$IP2 \$EADDR \$EIFACE \$MCASTADDR 2>&1 | tee -a /tmp/ngcp-installer-debug.log
+ngcp-installer \$ROLE \$IP1 \$IP2 \$EADDR \$EIFACE 2>&1 | tee -a /tmp/ngcp-installer-debug.log
 RC=\${PIPESTATUS[0]}
 if [ \$RC -ne 0 ] ; then
   echo "Fatal error while running ngcp-installer:" >&2