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

Merge pull request #2055 from shapeblue/sharedisolated 

CLOUDSTACK-9887 ignore bogus default gateway
This commit is contained in:
Rajani Karuturi 2017-05-17 09:53:39 +05:30 committed by GitHub
parent 9c4eb959c3 2e926d87e0
commit cbd3662482
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/src/com/cloud/network/router/CommandSetupHelper.java
View File

@ -108,8 +108,6 @@ import com.cloud.offering.NetworkOffering;
import com.cloud.offerings.NetworkOfferingVO;
import com.cloud.offerings.dao.NetworkOfferingDao;
import com.cloud.service.dao.ServiceOfferingDao;
import com.cloud.storage.GuestOSVO;
import com.cloud.storage.dao.GuestOSDao;
import com.cloud.user.Account;
import com.cloud.uservm.UserVm;
import com.cloud.utils.Pair;
@ -174,8 +172,6 @@ public class CommandSetupHelper {
private VlanDao _vlanDao;
@Inject
private IPAddressDao _ipAddressDao;
@Inject
private GuestOSDao _guestOSDao;
@Inject
private RouterControlHelper _routerControlHelper;
@ -219,12 +215,6 @@ public class CommandSetupHelper {
_networkModel.getExecuteInSeqNtwkElmtCmd());
String gatewayIp = nic.getIPv4Gateway();
if (!nic.isDefaultNic()) {
final GuestOSVO guestOS = _guestOSDao.findById(vm.getGuestOSId());
if (guestOS == null || !guestOS.getDisplayName().toLowerCase().contains("windows")) {
gatewayIp = "0.0.0.0";
}
}
final DataCenterVO dcVo = _dcDao.findById(router.getDataCenterId());

7
systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py
View File

@ -89,9 +89,10 @@ class CsDhcp(CsDataBag):
gateway = gn.get_gateway()
else:
gateway = i['gateway']
sline = "dhcp-option=tag:interface-%s-%s,3," % (device, idx)
line = "dhcp-option=tag:interface-%s-%s,3,%s" % (device, idx, gateway)
self.conf.search(sline, line)
if gateway != '0.0.0.0':
sline = "dhcp-option=tag:interface-%s-%s,3," % (device, idx)
line = "dhcp-option=tag:interface-%s-%s,3,%s" % (device, idx, gateway)
self.conf.search(sline, line)
# Netmask
netmask = ''
if self.config.is_vpc():