You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2013/05/02 19:31:45 UTC
[39/50] git commit: updated refs/heads/ui-cisco-asa1000v-support to
ac07a54
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/ui-cisco-asa1000v-support
Commit: 6a182c874c714b1dae7f60267c73510c36578bae
Parents: 85a1cc9
Author: Sateesh Chodapuneedi <sa...@apache.org>
Authored: Thu May 2 17:04:55 2013 +0530
Committer: Sateesh Chodapuneedi <sa...@apache.org>
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<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.");
}
}