Updated Branches: refs/heads/master 155436870 -> 55c67092d
Commit for https://reviews.apache.org/r/6547/ Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/55c67092 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/55c67092 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/55c67092 Branch: refs/heads/master Commit: 55c67092d0bbd8116b21efd088f7960ecc1256b4 Parents: 1554368 Author: Kelven Yang <[email protected]> Authored: Tue Aug 28 14:50:02 2012 -0700 Committer: Kelven Yang <[email protected]> Committed: Tue Aug 28 14:58:04 2012 -0700 ---------------------------------------------------------------------- .../hypervisor/vmware/resource/VmwareResource.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/55c67092/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 2b7b485..2686c2d 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 @@ -1344,11 +1344,11 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa args += vlanGateway; if (s_logger.isDebugEnabled()) { - s_logger.debug("Run command on domain router " + privateIpAddress + ", /root/ipassoc.sh " + args); + s_logger.debug("Run command on domain router " + privateIpAddress + ", /opt/cloud/bin/ipassoc.sh " + args); } VmwareManager mgr = getServiceContext().getStockObject(VmwareManager.CONTEXT_STOCK_NAME); - Pair<Boolean, String> result = SshHelper.sshExecute(privateIpAddress, DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null, "/root/ipassoc.sh " + args); + Pair<Boolean, String> result = SshHelper.sshExecute(privateIpAddress, DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null, "/opt/cloud/bin/ipassoc.sh " + args); if (!result.first()) { s_logger.error("ipassoc command on domain router " + privateIpAddress + " failed. message: " + result.second());
