Updated Branches: refs/heads/master 3dabd5fbf -> 1a2e69fb2
Summary: fix ipsectunnel.sh being called as ipsectunnel in KVM S2S vpn Signed-off-by: Marcus Sorensen <[email protected]> 1358446410 -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/1a2e69fb Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/1a2e69fb Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/1a2e69fb Branch: refs/heads/master Commit: 1a2e69fb22a64b84960860965d4f757637ac5e12 Parents: 3dabd5f Author: Marcus Sorensen <[email protected]> Authored: Thu Jan 17 11:13:30 2013 -0700 Committer: Marcus Sorensen <[email protected]> Committed: Thu Jan 17 11:13:30 2013 -0700 ---------------------------------------------------------------------- .../virtualnetwork/VirtualRoutingResource.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1a2e69fb/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); } http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1a2e69fb/scripts/storage/qcow2/resizevolume.sh ---------------------------------------------------------------------- diff --git a/scripts/storage/qcow2/resizevolume.sh b/scripts/storage/qcow2/resizevolume.sh old mode 100644 new mode 100755
