Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6D1C610A47 for ; Fri, 3 May 2013 13:14:50 +0000 (UTC) Received: (qmail 80942 invoked by uid 500); 3 May 2013 13:14:48 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 80514 invoked by uid 500); 3 May 2013 13:14:47 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 80269 invoked by uid 99); 3 May 2013 13:14:44 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 May 2013 13:14:44 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 2619288605A; Fri, 3 May 2013 13:14:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kishan@apache.org To: commits@cloudstack.apache.org Date: Fri, 03 May 2013 13:14:59 -0000 Message-Id: <0a39c10452134100859f739bc6f4a386@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [17/50] [abbrv] git commit: updated refs/heads/network_acl to 1609d01 Fixing build breakage. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6a182c87 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6a182c87 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6a182c87 Branch: refs/heads/network_acl Commit: 6a182c874c714b1dae7f60267c73510c36578bae Parents: 85a1cc9 Author: Sateesh Chodapuneedi Authored: Thu May 2 17:04:55 2013 +0530 Committer: Sateesh Chodapuneedi Committed: Thu May 2 17:04:55 2013 +0530 ---------------------------------------------------------------------- .../hypervisor/vmware/resource/VmwareResource.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a182c87/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 28a54e1..030eff0 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 @@ -1479,11 +1479,11 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa snatArgs += " -c "; snatArgs += "eth" + ethDeviceNum; - Pair result = SshHelper.sshExecute(routerIp, DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null, + Pair result_gateway = SshHelper.sshExecute(routerIp, DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null, "/opt/cloud/bin/vpc_privateGateway.sh " + args); - if (!result.first()) { - throw new InternalErrorException("Unable to assign public IP address"); + if (!result_gateway.first()) { + throw new InternalErrorException("Unable to configure source NAT for public IP address."); } }