etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-6267: unblocking smb as zone wide primary storage for hyperv 

Signed-off-by: Devdeep Singh <devdeep@gmail.com>
This commit is contained in:
Anshul Gangwar 2014-03-21 12:05:23 +05:30 committed by Devdeep Singh
parent 38b8677e01
commit 0ad1a517a2
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/com/cloud/storage/StorageManagerImpl.java
View File

@ -618,7 +618,7 @@ public class StorageManagerImpl extends ManagerBase implements StorageManager, C
} else {
throw new InvalidParameterValueException("Missing parameter hypervisor. Hypervisor type is required to create zone wide primary storage.");
}
if (hypervisorType != HypervisorType.KVM && hypervisorType != HypervisorType.VMware && hypervisorType != HypervisorType.Any) {
if (hypervisorType != HypervisorType.KVM && hypervisorType != HypervisorType.VMware && hypervisorType != HypervisorType.Hyperv && hypervisorType != HypervisorType.Any) {
throw new InvalidParameterValueException("zone wide storage pool is not supported for hypervisor type " + hypervisor);
}
}

6
ui/scripts/system.js
View File

@ -15131,7 +15131,11 @@
id: 'VMware',
description: _l('VMware')
});
items.push({
id: 'Hyperv',
description: _l('Hyperv')
});
args.response.success({
data: items
});

4
ui/scripts/zoneWizard.js
View File

@ -1429,8 +1429,8 @@
return;
}
//zone-wide-primary-storage is supported only for KVM and VMWare
if (selectedHypervisorObj.hypervisortype == "KVM" || selectedHypervisorObj.hypervisortype == "VMware") {
//zone-wide-primary-storage is supported only for KVM and VMWare and Hyperv
if (selectedHypervisorObj.hypervisortype == "KVM" || selectedHypervisorObj.hypervisortype == "VMware" || selectedHypervisorObj.hypervisortype == "Hyperv") {
var scope = [];
scope.push({
id: 'zone',