mirror of
https://github.com/apache/cloudstack.git
synced 2025-11-03 04:12:31 +01:00
bug 6981: merge from 2.1.x
This commit is contained in:
parent
271f5a5255
commit
900d597002
@ -74,7 +74,7 @@ add_nat_entry() {
|
|||||||
ssh -p 3922 -o StrictHostKeyChecking=no -i $cert root@$dRIp "\
|
ssh -p 3922 -o StrictHostKeyChecking=no -i $cert root@$dRIp "\
|
||||||
ip addr add dev $correctVif $pubIp
|
ip addr add dev $correctVif $pubIp
|
||||||
iptables -t nat -I POSTROUTING -j SNAT -o $correctVif --to-source $ipNoMask ;
|
iptables -t nat -I POSTROUTING -j SNAT -o $correctVif --to-source $ipNoMask ;
|
||||||
/sbin/arping -c 3 -I $correctVif -A -U -s $ipNoMask $ipNoMask;
|
arping -c 3 -I $correctVif -A -U -s $ipNoMask $ipNoMask;
|
||||||
"
|
"
|
||||||
if [ $? -gt 0 -a $? -ne 2 ]
|
if [ $? -gt 0 -a $? -ne 2 ]
|
||||||
then
|
then
|
||||||
@ -112,7 +112,7 @@ add_an_ip () {
|
|||||||
ssh -p 3922 -o StrictHostKeyChecking=no -i $cert root@$dRIp "\
|
ssh -p 3922 -o StrictHostKeyChecking=no -i $cert root@$dRIp "\
|
||||||
ifconfig $correctVif up;
|
ifconfig $correctVif up;
|
||||||
ip addr add dev $correctVif $pubIp ;
|
ip addr add dev $correctVif $pubIp ;
|
||||||
/sbin/arping -c 3 -I $correctVif -A -U -s $ipNoMask $ipNoMask;
|
arping -c 3 -I $correctVif -A -U -s $ipNoMask $ipNoMask;
|
||||||
"
|
"
|
||||||
return $?
|
return $?
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user