apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug 12653: add default gateway support for multiple networks under VMware

Browse Source
This commit is contained in:
Kelven Yang 2011-12-19 14:48:47 -08:00
parent 2a2d424bcc
commit 55175fb2fd
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
View File

@ -933,10 +933,23 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
s_logger.info("Executing resource DhcpEntryCommand: " + _gson.toJson(cmd)); s_logger.info("Executing resource DhcpEntryCommand: " + _gson.toJson(cmd));
} }
// ssh -p 3922 -o StrictHostKeyChecking=no -i $cert root@$domr "/root/edithosts.sh $mac $ip $vm $dfltrt $ns $staticrt" >/dev/null
String args = " " + cmd.getVmMac(); String args = " " + cmd.getVmMac();
args += " " + cmd.getVmIpAddress(); args += " " + cmd.getVmIpAddress();
args += " " + cmd.getVmName(); args += " " + cmd.getVmName();
if (cmd.getDefaultRouter() != null) {
args += " " + cmd.getDefaultRouter();
}
if (cmd.getDefaultDns() != null) {
args += " " + cmd.getDefaultDns();
}
if (cmd.getStaticRoutes() != null) {
args += " " + cmd.getStaticRoutes();
}
if (s_logger.isDebugEnabled()) { if (s_logger.isDebugEnabled()) {
s_logger.debug("Run command on domR " + cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP) + ", /root/edithosts.sh " + args); s_logger.debug("Run command on domR " + cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP) + ", /root/edithosts.sh " + args);
} }

4
vmware-base/src/com/cloud/hypervisor/vmware/mo/HostMO.java
View File

@ -469,8 +469,8 @@ public class HostMO extends BaseMO implements VmwareHypervisorHost {
for(ObjectContent oc : ocs) { for(ObjectContent oc : ocs) {
String vmName = oc.getPropSet()[0].getVal().toString(); String vmName = oc.getPropSet()[0].getVal().toString();
if(s_logger.isDebugEnabled()) if(s_logger.isTraceEnabled())
s_logger.debug("put " + vmName + " into host cache"); s_logger.trace("put " + vmName + " into host cache");
_vmCache.put(vmName, new VirtualMachineMO(_context, oc.getObj())); _vmCache.put(vmName, new VirtualMachineMO(_context, oc.getObj()));
} }