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

Append template unique name for S3 key for template sync.

Browse Source
This commit is contained in:
Min Chen 2013-05-08 17:58:52 -07:00
parent dc5d2f45e9
commit 8ad517c028
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/com/cloud/storage/template/DownloadManagerImpl.java
View File

@ -491,6 +491,7 @@ public class DownloadManagerImpl extends ManagerBase implements DownloadManager
throw new CloudRuntimeException("Unable to download from URL: " + url); throw new CloudRuntimeException("Unable to download from URL: " + url);
} }
DownloadJob dj = new DownloadJob(td, jobId, id, name, format, hvm, accountId, descr, cksum, installPathPrefix, resourceType); DownloadJob dj = new DownloadJob(td, jobId, id, name, format, hvm, accountId, descr, cksum, installPathPrefix, resourceType);
dj.setTmpltPath(installPathPrefix);
jobs.put(jobId, dj); jobs.put(jobId, dj);
threadPool.execute(td); threadPool.execute(td);
@ -665,6 +666,9 @@ public class DownloadManagerImpl extends ManagerBase implements DownloadManager
} else { } else {
installPathPrefix = resource.getRootDir(cmd) + File.separator + installPathPrefix; installPathPrefix = resource.getRootDir(cmd) + File.separator + installPathPrefix;
} }
} else if (dstore instanceof S3TO ){
// S3 key has template name inside to help template sync
installPathPrefix = installPathPrefix + File.separator + cmd.getName();
} }
String user = null; String user = null;
String password = null; String password = null;