Return-Path: X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8E604D41F for ; Thu, 4 Oct 2012 09:58:15 +0000 (UTC) Received: (qmail 83330 invoked by uid 500); 4 Oct 2012 09:58:15 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 83154 invoked by uid 500); 4 Oct 2012 09:58:13 -0000 Mailing-List: contact cloudstack-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-commits@incubator.apache.org Received: (qmail 83136 invoked by uid 99); 4 Oct 2012 09:58:13 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Oct 2012 09:58:13 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 9EBD13A062; Thu, 4 Oct 2012 09:58:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: muralireddy@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: git commit: CLOUDSTACK-254: Fix exec path for netusage.sh Message-Id: <20121004095812.9EBD13A062@tyr.zones.apache.org> Date: Thu, 4 Oct 2012 09:58:12 +0000 (UTC) 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 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 Authored: Thu Oct 4 14:26:09 2012 +0530 Committer: Murali Reddy 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 result = SshHelper.sshExecute(privateIpAddress, DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null, "/root/netusage.sh " + args); + Pair result = SshHelper.sshExecute(privateIpAddress, DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null, "/opt/cloud/bin/netusage.sh " + args); if (!result.first()) { return null;