You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ya...@apache.org on 2013/10/25 02:43:31 UTC
git commit: updated refs/heads/master to df1924d
Updated Branches:
refs/heads/master 152872594 -> df1924d91
CLOUDSTACK-754: Fix KVM and Vmware resource for VPN
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/df1924d9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/df1924d9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/df1924d9
Branch: refs/heads/master
Commit: df1924d910b347db86625777e9c12a54cf1618fe
Parents: 1528725
Author: Sheng Yang <sh...@citrix.com>
Authored: Thu Oct 24 17:43:03 2013 -0700
Committer: Sheng Yang <sh...@citrix.com>
Committed: Thu Oct 24 17:43:03 2013 -0700
----------------------------------------------------------------------
.../agent/resource/virtualnetwork/VirtualRoutingResource.java | 2 ++
.../src/com/cloud/hypervisor/vmware/resource/VmwareResource.java | 2 ++
2 files changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/df1924d9/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
index f18caaa..874146c 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");
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/df1924d9/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
----------------------------------------------------------------------
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 77e799d..423abe6 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);