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

CLOUDSTACK-754: Fix KVM and Vmware resource for VPN

This commit is contained in:
Sheng Yang 2013-10-24 17:43:03 -07:00
parent 1528725949
commit df1924d910
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
View File

@ -213,6 +213,8 @@ public class VirtualRoutingResource implements Manager {
args += " -s ";
args += cmd.getVpnServerIp();
}
args += " -C " + cmd.getLocalCidr();
args += " -i " + cmd.getPublicInterface();
String result = routerProxy("vpn_l2tp.sh", cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP), args);
if (result != null) {
return new Answer(cmd, false, "Configure VPN failed");

2
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
View File

@ -3591,6 +3591,8 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
} else {
argsBuf.append(" -d ").append(" -s ").append(cmd.getVpnServerIp());
}
argsBuf.append(" -C ").append(cmd.getLocalCidr());
argsBuf.append(" -i ").append(cmd.getPublicInterface());
try {
VmwareManager mgr = getServiceContext().getStockObject(VmwareManager.CONTEXT_STOCK_NAME);