You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mu...@apache.org on 2012/10/04 11:58:12 UTC
git commit: CLOUDSTACK-254: Fix exec path for netusage.sh
Updated Branches:
refs/heads/master 17564da6f -> 3e7ba774f
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 <ro...@citrix.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/3e7ba774
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/3e7ba774
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/3e7ba774
Branch: refs/heads/master
Commit: 3e7ba774f92c31ed5be649e4ed5ec315757ef93e
Parents: 17564da
Author: Rohit Yadav <ro...@citrix.com>
Authored: Thu Oct 4 14:26:09 2012 +0530
Committer: Murali Reddy <Mu...@citrix.com>
Committed: Thu Oct 4 15:30:43 2012 +0530
----------------------------------------------------------------------
.../hypervisor/vmware/resource/VmwareResource.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3e7ba774/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;