You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by hu...@apache.org on 2013/01/21 12:18:50 UTC
[19/50] [abbrv] git commit: Summary: fix ipsectunnel.sh being called
as ipsectunnel in KVM S2S vpn
Summary: fix ipsectunnel.sh being called as ipsectunnel in KVM S2S vpn
Signed-off-by: Marcus Sorensen <ma...@betterservers.com> 1358446796 -0700
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/b77503b5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/b77503b5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/b77503b5
Branch: refs/heads/cloud-agent-with-openvswitch
Commit: b77503b5bd001d1038bb4cd79c04db7ca993e94e
Parents: 1ff7a14
Author: Marcus Sorensen <ma...@betterservers.com>
Authored: Thu Jan 17 11:19:56 2013 -0700
Committer: Marcus Sorensen <ma...@betterservers.com>
Committed: Thu Jan 17 11:19:56 2013 -0700
----------------------------------------------------------------------
.../virtualnetwork/VirtualRoutingResource.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b77503b5/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 2dc7950..18a0426 100755
--- a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
+++ b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
@@ -720,7 +720,7 @@ public class VirtualRoutingResource implements Manager {
args += " -N ";
args += cmd.getPeerGuestCidrList();
}
- String result = routerProxy("ipsectunnel", cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP), args);
+ String result = routerProxy("ipsectunnel.sh", cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP), args);
if (result != null) {
return new Answer(cmd, false, "Configure site to site VPN failed due to " + result);
}