diff --git a/patches/systemvm/debian/config/etc/init.d/cloud-early-config b/patches/systemvm/debian/config/etc/init.d/cloud-early-config index 19dffd854bf..e9e9fec7c44 100755 --- a/patches/systemvm/debian/config/etc/init.d/cloud-early-config +++ b/patches/systemvm/debian/config/etc/init.d/cloud-early-config @@ -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 diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java index c0daf55e5ba..f6208894947 100755 --- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java @@ -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 {