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>
ksolomko/vlan
Michael Prokop 14 years ago
parent 3d53a97bf9
commit fb6813974d

@ -30,7 +30,7 @@ INTERACTIVE=false
LOCAL_MIRROR=false LOCAL_MIRROR=false
DHCP=false DHCP=false
LOGO=true LOGO=true
BONDING=true BONDING=false
USE_LOCAL_MIRROR=true USE_LOCAL_MIRROR=true
LINUX_HA3=false LINUX_HA3=false
export DISK=sda # will be configured as /dev/sda export DISK=sda # will be configured as /dev/sda
@ -105,6 +105,10 @@ if checkBootParam ngcpnobonding ; then
BONDING=false BONDING=false
fi fi
if checkBootParam ngcpbonding ; then
BONDING=true
fi
if checkBootParam nolocalmirror ; then if checkBootParam nolocalmirror ; then
USE_LOCAL_MIRROR=false USE_LOCAL_MIRROR=false
fi fi
@ -262,6 +266,7 @@ for param in $* ; do
*ngcpnw.dhcp*) export DHCP=true;; *ngcpnw.dhcp*) export DHCP=true;;
*ngcphav3*) LINUX_HA3=true; PRO_EDITION=true;; *ngcphav3*) LINUX_HA3=true; PRO_EDITION=true;;
*ngcpnobonding*) BONDING=false;; *ngcpnobonding*) BONDING=false;;
*ngcpbonding*) BONDING=true;;
esac esac
shift shift
done done
@ -605,7 +610,7 @@ if "$NGCP_INSTALLER" ; then
PKG=ngcp-installer-latest.deb PKG=ngcp-installer-latest.deb
wget http://deb.sipwise.com/sppro/\$PKG wget http://deb.sipwise.com/sppro/\$PKG
dpkg -i \$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]} RC=\${PIPESTATUS[0]}
if [ \$RC -ne 0 ] ; then if [ \$RC -ne 0 ] ; then
echo "Fatal error while running ngcp-installer:" >&2 echo "Fatal error while running ngcp-installer:" >&2

Loading…
Cancel
Save