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

Merge remote-tracking branch 'apache/4.15'

Browse Source
This commit is contained in:
Abhishek Kumar 2021-05-31 09:47:33 +05:30
commit b104aca587
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
View File

@ -3260,7 +3260,7 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S
long accountTemplateDirSize = 0; long accountTemplateDirSize = 0;
File accountTemplateDir = new File(rootDir + getTemplatePathForAccount(accountId)); File accountTemplateDir = new File(rootDir + getTemplatePathForAccount(accountId));
if (accountTemplateDir.exists()) { if (accountTemplateDir.exists()) {
FileUtils.sizeOfDirectory(accountTemplateDir); accountTemplateDirSize = FileUtils.sizeOfDirectory(accountTemplateDir);
} }
long accountVolumeDirSize = 0; long accountVolumeDirSize = 0;
File accountVolumeDir = new File(rootDir + getVolumePathForAccount(accountId)); File accountVolumeDir = new File(rootDir + getVolumePathForAccount(accountId));

3
ui/src/views/image/RegisterOrUploadTemplate.vue
View File

@ -837,6 +837,9 @@ export default {
} }
} }
} }
if (!('requireshvm' in params)) { // handled as default true by API
params.requireshvm = false
}
if (this.currentForm === 'Create') { if (this.currentForm === 'Create') {
this.loading = true this.loading = true
api('registerTemplate', params).then(json => { api('registerTemplate', params).then(json => {