Fixing build breakage. Signed-off-by: Sateesh Chodapuneedi <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/565997d9 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/565997d9 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/565997d9 Branch: refs/heads/vmware-datamodel Commit: 565997d9b3e89936b066c43f429a4a4bf234c126 Parents: 85a1cc9 Author: Sateesh Chodapuneedi <[email protected]> Authored: Thu May 2 17:04:55 2013 +0530 Committer: Sateesh Chodapuneedi <[email protected]> Committed: Thu May 2 17:10:21 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/565997d9/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<Boolean, String> result = SshHelper.sshExecute(routerIp, DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null, + Pair<Boolean, String> 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."); } }
