etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

VPC : fix for CONNMARK

This commit is contained in:
anthony 2012-06-25 20:46:45 -07:00
parent 0f863b3025
commit 493560e370
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
patches/systemvm/debian/config/opt/cloud/bin/cloud-nic.sh
View File

@ -2,9 +2,6 @@
plug_nic() {
sudo iptables -t mangle -A PREROUTING -i $dev -m state --state NEW -j MARK --set-mark $tableNo 2>/dev/null
sudo iptables -t mangle -A PREROUTING -i $dev -m state --state NEW -j CONNMARK --save-mark 2>/dev/null
sudo echo "$tableNo $tableName" >> /etc/iproute2/rt_tables 2>/dev/null
sudo ip rule add fwmark $tableNo table $tableName 2>/dev/null
sudo ip route flush table $tableName
@ -13,8 +10,7 @@ plug_nic() {
unplug_nic() {
sudo iptables -t mangle -D PREROUTING -i $dev -m state --state NEW -j MARK --set-mark $tableNo 2>/dev/null
sudo iptables -t mangle -D PREROUTING -i $dev -m state --state NEW -j CONNMARK --save-mark 2>/dev/null
sudo iptables -t mangle -D PREROUTING -i $dev -m state --state NEW -j CONNMARK --set-mark $tableNo 2>/dev/null
sudo ip rule del fwmark $tableNo 2>/dev/null
sudo ip route flush table $tableName

6
patches/systemvm/debian/config/opt/cloud/bin/vpc_ipassoc.sh
View File

@ -64,6 +64,12 @@ add_an_ip () {
sudo ip link set $ethDev up
sudo arping -c 3 -I $ethDev -A -U -s $pubIp $pubIp
fi
local tableNo=$(echo $ethDev | awk -F'eth' '{print $2}')
sudo iptables-save -t mangle | grep "PREROUTING -i $ethDev -m state --state NEW -j CONNMARK --set-mark" 2>/dev/null
if [ $? -gt 0 ]
then
sudo iptables -t mangle -A PREROUTING -i $ethDev -m state --state NEW -j CONNMARK --set-mark $tableNo 2>/dev/null
fi
add_routing
return $?
}