Updated Branches: refs/heads/master 1ff7a147b -> b77503b5b
Summary: fix ipsectunnel.sh being called as ipsectunnel in KVM S2S vpn Signed-off-by: Marcus Sorensen <[email protected]> 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/master Commit: b77503b5bd001d1038bb4cd79c04db7ca993e94e Parents: 1ff7a14 Author: Marcus Sorensen <[email protected]> Authored: Thu Jan 17 11:19:56 2013 -0700 Committer: Marcus Sorensen <[email protected]> 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); }
