CLOUDSTACK-254: Fix exec path for netusage.sh Fixes the hard coded path in the vmware plugin. The systemvm.iso file would copy the script only to /opt/cloud/bin. Same is the path used for vpc_netusage.sh
Signed-off-by: Rohit Yadav <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/a6a3cb5d Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/a6a3cb5d Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/a6a3cb5d Branch: refs/heads/maven-to-rpm Commit: a6a3cb5d796467fbb5278e0d7e0191c91ffd92c4 Parents: f323b95 Author: Rohit Yadav <[email protected]> Authored: Thu Oct 4 14:26:09 2012 +0530 Committer: Hugo Trippaers <[email protected]> Committed: Sat Oct 6 00:30:26 2012 +0200 ---------------------------------------------------------------------- .../hypervisor/vmware/resource/VmwareResource.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6a3cb5d/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 f89adf1..0b0f285 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 @@ -4555,12 +4555,12 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa try { if (s_logger.isTraceEnabled()) { - s_logger.trace("Executing /root/netusage.sh " + args + " on DomR " + privateIpAddress); + s_logger.trace("Executing /opt/cloud/bin/netusage.sh " + args + " on DomR " + privateIpAddress); } VmwareManager mgr = getServiceContext().getStockObject(VmwareManager.CONTEXT_STOCK_NAME); - Pair<Boolean, String> result = SshHelper.sshExecute(privateIpAddress, DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null, "/root/netusage.sh " + args); + Pair<Boolean, String> result = SshHelper.sshExecute(privateIpAddress, DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null, "/opt/cloud/bin/netusage.sh " + args); if (!result.first()) { return null;
