From df1924d910b347db86625777e9c12a54cf1618fe Mon Sep 17 00:00:00 2001 From: Sheng Yang Date: Thu, 24 Oct 2013 17:43:03 -0700 Subject: [PATCH] CLOUDSTACK-754: Fix KVM and Vmware resource for VPN --- .../agent/resource/virtualnetwork/VirtualRoutingResource.java | 2 ++ .../com/cloud/hypervisor/vmware/resource/VmwareResource.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java index f18caaa9266..874146c6258 100755 --- a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java +++ b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java @@ -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"); diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java index 77e799d5c82..423abe67a47 100755 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java @@ -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);