Changed the hardcoded vmware path to point to cloud/common
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/9d94e6b1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/9d94e6b1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/9d94e6b1 Branch: refs/heads/javelin Commit: 9d94e6b1d320ab9c4d5e7c1796fd14332000213d Parents: 7282f43 Author: Alex Huang <[email protected]> Authored: Sat Oct 6 23:08:59 2012 -0700 Committer: Alex Huang <[email protected]> Committed: Sat Oct 6 23:43:44 2012 -0700 ---------------------------------------------------------------------- .../vmware/manager/VmwareManagerImpl.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9d94e6b1/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java index ce1af26..64ded51 100755 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java @@ -664,9 +664,9 @@ public class VmwareManagerImpl implements VmwareManager, VmwareStorageMount, Lis File file = new File(url.getFile()); File isoFile = new File(file.getParent() + "/vms/systemvm.iso"); if (!isoFile.exists()) { - isoFile = new File("/usr/lib64/cloud/agent/" + "/vms/systemvm.iso"); + isoFile = new File("/usr/lib64/cloud/common/" + "/vms/systemvm.iso"); if (!isoFile.exists()) { - isoFile = new File("/usr/lib/cloud/agent/" + "/vms/systemvm.iso"); + isoFile = new File("/usr/lib/cloud/common/" + "/vms/systemvm.iso"); } } return isoFile; @@ -679,9 +679,9 @@ public class VmwareManagerImpl implements VmwareManager, VmwareStorageMount, Lis File keyFile = new File(file.getParent(), "/scripts/vm/systemvm/id_rsa.cloud"); if (!keyFile.exists()) { - keyFile = new File("/usr/lib64/cloud/agent" + "/scripts/vm/systemvm/id_rsa.cloud"); + keyFile = new File("/usr/lib64/cloud/common" + "/scripts/vm/systemvm/id_rsa.cloud"); if (!keyFile.exists()) { - keyFile = new File("/usr/lib/cloud/agent" + "/scripts/vm/systemvm/id_rsa.cloud"); + keyFile = new File("/usr/lib/cloud/common" + "/scripts/vm/systemvm/id_rsa.cloud"); } } return keyFile;
