apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug 6981: merge from 2.1.x bug 6807

Browse Source 
status 6981: resolved fixed
This commit is contained in:
Chiradeep Vittal 2010-11-04 12:45:46 -07:00
parent 900d597002
commit 04f89d89ec
1 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
scripts/network/domr/ipassoc.sh
View File

@ -122,11 +122,32 @@ remove_an_ip () {
local pubIp=$2
local ipNoMask=$(echo $2 | awk -F'/' '{print $1}')
local mask=$(echo $2 | awk -F'/' '{print $2}')
[ "$mask" == "" ] && mask="32"
ssh -p 3922 -o StrictHostKeyChecking=no -i $cert root@$dRIp "\
ip addr del dev $correctVif "$ipNoMask/$mask"
local existingIpMask=$(ssh -p 3922 -o StrictHostKeyChecking=no -i $cert root@$dRIp "
ip addr show dev $correctVif | grep inet | awk '{print \$2}' | grep -w $ipNoMask
")
[ "$existingIpMask" == "" ] && return 0
local existingMask=$(echo $existingIpMask | awk -F'/' '{print $2}')
if [ "$existingMask" == "32" ]
then
ssh -p 3922 -o StrictHostKeyChecking=no -i $cert root@$dRIp "
ip addr del dev $correctVif $existingIpMask
"
if [ $? -gt 0 -a $? -ne 2 ]
result=$?
fi
if [ "$existingMask" != "32" ]
then
ssh -p 3922 -o StrictHostKeyChecking=no -i $cert root@$dRIp "
replaceIpMask=\`ip addr show dev $correctVif | grep inet | grep -v $existingIpMask | awk '{print \$2}' | sort -t/ -k2 -n|tail -1\`
ip addr del dev $correctVif $existingIpMask;
if [ -n \"\$replaceIpMask\" ]; then
ip addr del dev $correctVif \$replaceIpMask;
replaceIp=\`echo \$replaceIpMask | awk -F/ '{print \$1}'\`;
ip addr add dev $correctVif \$replaceIp/$existingMask;
fi
"
result=$?
fi
if [ $result -gt 0 -a $result -ne 2 ]
then
return 1
fi