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

Revert "bug 11191:" 

This reverts commit 6e59b94d6be8a9638df3e4f3de3b0993961da631.
This commit is contained in:
Naredula Janardhana Reddy 2011-08-24 13:40:04 +05:30
parent b7cf081281
commit 1190e70f22
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
patches/systemvm/debian/config/etc/init.d/cloud-early-config
View File

@ -186,10 +186,10 @@ disable_rpfilter() {
disable_rpfilter_domR() {
log_it "cloud: disable rp_filter"
log_it "disable rpfilter"
sed -i "s/net.ipv4.conf.default.rp_filter.*$/net.ipv4.conf.default.rp_filter = 0/" /etc/sysctl.conf
if [ "$DISABLE_RP_FILTER" == "true" ]
then
log_it "cloud: disable rp_filter on public interfaces"
#FIXME : currently public interfaces are assumed as eth2 and eth3.
log_it "cloud: disable rp_filter : updating proc"
sed -i "s/net.ipv4.conf.eth2.rp_filter.*$/net.ipv4.conf.eth2.rp_filter = 0/" /etc/sysctl.conf
sed -i "s/net.ipv4.conf.eth3.rp_filter.*$/net.ipv4.conf.eth3.rp_filter = 0/" /etc/sysctl.conf
echo "0" > /proc/sys/net/ipv4/conf/eth2/rp_filter

8
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
View File

@ -1226,15 +1226,7 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian
dhcpRange = NetUtils.getDhcpRange(cidr);
}
}
String rpValue = _configDao.getValue(Config.NetworkRouterRpFilter.key());
if (rpValue != null && rpValue.equalsIgnoreCase("true")) {
_disable_rp_filter = true;
}else
{
_disable_rp_filter = false;
}
if (router.getRole() == Role.DHCP_USERDATA) {
type = "dhcpsrvr";
} else {