You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sa...@apache.org on 2013/05/30 13:22:58 UTC
[27/50] [abbrv] git commit: updated refs/heads/vmware-storage-motion
to 406785b
Don't need to handle dhcp entry differently for different guest OS
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/51930405
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/51930405
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/51930405
Branch: refs/heads/vmware-storage-motion
Commit: 51930405d9998a352071f4ec8104c0e03300e389
Parents: 271cf92
Author: Anthony Xu <an...@citrix.com>
Authored: Wed May 29 16:51:42 2013 -0700
Committer: Anthony Xu <an...@citrix.com>
Committed: Wed May 29 16:51:42 2013 -0700
----------------------------------------------------------------------
.../router/VirtualNetworkApplianceManagerImpl.java | 13 -------------
1 files changed, 0 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51930405/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index b969be2..9e01aa3 100755
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -3370,20 +3370,7 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V
DataCenterVO dcVo = _dcDao.findById(router.getDataCenterId());
Nic defaultNic = findGatewayIp(vm.getId());
String gatewayIp = defaultNic.getGateway();
- boolean needGateway = true;
if (gatewayIp != null && !gatewayIp.equals(nic.getGateway())) {
- needGateway = false;
- GuestOSVO guestOS = _guestOSDao.findById(vm.getGuestOSId());
- // Do set dhcp:router option for non-default nic on certain OS(including Windows), and leave other OS unset.
- // Because some OS(e.g. CentOS) would set routing on wrong interface
- for (String name : _guestOSNeedGatewayOnNonDefaultNetwork) {
- if (guestOS.getDisplayName().startsWith(name)) {
- needGateway = true;
- break;
- }
- }
- }
- if (!needGateway) {
gatewayIp = "0.0.0.0";
}
dhcpCommand.setDefaultRouter(gatewayIp);