apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Changed the hardcoded vmware path to point to cloud/common

Browse Source
This commit is contained in:
Alex Huang 2012-10-06 23:08:59 -07:00
parent 7282f4355a
commit 9d94e6b1d3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
View File

@ -664,9 +664,9 @@ public class VmwareManagerImpl implements VmwareManager, VmwareStorageMount, Lis
File file = new File(url.getFile()); File file = new File(url.getFile());
File isoFile = new File(file.getParent() + "/vms/systemvm.iso"); File isoFile = new File(file.getParent() + "/vms/systemvm.iso");
if (!isoFile.exists()) { 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()) { 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; 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"); File keyFile = new File(file.getParent(), "/scripts/vm/systemvm/id_rsa.cloud");
if (!keyFile.exists()) { 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()) { 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; return keyFile;