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

Don't blindly switch to XenServer in premium build if database is pre-populated with a hypervisor tyoe other then FOSS default KVM

This commit is contained in:
Kelven Yang 2010-12-27 14:01:09 -08:00
parent bb7170884d
commit 34cec61ff7
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/src/com/cloud/server/ConfigurationServerImpl.java
View File

@ -53,6 +53,7 @@ import com.cloud.domain.DomainVO;
import com.cloud.domain.dao.DomainDao;
import com.cloud.exception.InternalErrorException;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.network.Network.State;
import com.cloud.network.NetworkVO;
import com.cloud.network.Networks.Availability;
@ -151,8 +152,13 @@ public class ConfigurationServerImpl implements ConfigurationServer {
// _configDao.update("network.type", "vlan");
// s_logger.debug("ConfigurationServer changed the network type to \"vlan\".");
_configDao.update("hypervisor.type", "xenserver");
s_logger.debug("ConfigurationServer changed the hypervisor type to \"xenserver\".");
// Default value is set as KVM because of FOSS build, when we are
// running under premium, autoset to XenServer if we know it is from FOSS settings
String value = _configDao.getValue(Config.HypervisorDefaultType.key());
if (value == null || value.equalsIgnoreCase(HypervisorType.KVM.toString())) {
_configDao.update("hypervisor.type", "xenserver");
s_logger.debug("ConfigurationServer changed the hypervisor type to \"xenserver\".");
}
_configDao.update("secondary.storage.vm", "true");
s_logger.debug("ConfigurationServer made secondary storage vm required.");