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

Add KVM to hypervisor types allowed in VPC

Browse Source 
RB: https://reviews.apache.org/r/6926/
Send-by: Marcus Sorensen
This commit is contained in:
Edison Su 2012-09-07 14:35:31 -07:00
parent a19d7ab00b
commit 24fa14845b
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/src/com/cloud/network/vpc/VpcManagerImpl.java
View File

@ -1963,6 +1963,7 @@ public class VpcManagerImpl implements VpcManager, Manager{
List<HypervisorType> hTypes = new ArrayList<HypervisorType>();
hTypes.add(HypervisorType.XenServer);
hTypes.add(HypervisorType.VMware);
hTypes.add(HypervisorType.KVM);
return hTypes;
}
}

2
server/src/com/cloud/vm/UserVmManagerImpl.java
View File

@ -2240,7 +2240,7 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
throw new InvalidParameterValueException("Unable to find network by id " + networkIdList.get(0).longValue());
}
if (network.getVpcId() != null) {
//Only XenServer and VmWare hypervisors are supported for vpc networks
//Only XenServer, KVM, and VmWare hypervisors are supported for vpc networks
if (!vpcSupportedHTypes.contains(template.getHypervisorType())) {
throw new InvalidParameterValueException("Can't create vm from template with hypervisor "
+ template.getHypervisorType() + " in vpc network " + network);