mirror of https://github.com/apache/cloudstack.git
fix add xen-pv-iso, add cloud-guest as the xen.guest.network
This commit is contained in:
parent
6827ff814b
commit
abba8398b3
|
|
@ -491,7 +491,7 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L
|
|||
Long id;
|
||||
if (tmplt == null) {
|
||||
id = _tmpltDao.getNextInSequence(Long.class, "id");
|
||||
VMTemplateVO template = new VMTemplateVO(id, xenPVISO.getTemplateName(), xenPVISO.getTemplateName(), ImageFormat.ISO , true, true, FileSystem.cdfs, "/opt/xensource/packages/iso/xs-tools-5.5.0.iso", null, true, 64, Account.ACCOUNT_ID_SYSTEM, null, "xen-pv-drv-iso", false, 1, false, null);
|
||||
VMTemplateVO template = new VMTemplateVO(id, xenPVISO.getTemplateName(), xenPVISO.getTemplateName(), ImageFormat.ISO , true, true, FileSystem.cdfs, "/opt/xensource/packages/iso/xs-tools-5.5.0.iso", null, true, 64, Account.ACCOUNT_ID_SYSTEM, null, "xen-pv-drv-iso", false, 1, false, HypervisorType.None);
|
||||
_tmpltDao.persist(template);
|
||||
} else {
|
||||
id = _tmpltDao.findByName(xenPVISO.getTemplateName()).getId();
|
||||
|
|
|
|||
|
|
@ -143,6 +143,8 @@ public class ConfigurationServerImpl implements ConfigurationServer {
|
|||
_configMgr.createDiskOffering(User.UID_SYSTEM, DomainVO.ROOT_DOMAIN, "Large", "Large Disk, 100 GB", 100, null);
|
||||
//_configMgr.createDiskOffering(User.UID_SYSTEM, DomainVO.ROOT_DOMAIN, "Private", "Private Disk", 0, null);
|
||||
|
||||
_configDao.update("xen.guest.network.device", "cloud-guest");
|
||||
|
||||
//Add default manual snapshot policy
|
||||
SnapshotPolicyVO snapPolicy = new SnapshotPolicyVO(0L, "00", "GMT", (short)4, 0);
|
||||
_snapPolicyDao.persist(snapPolicy);
|
||||
|
|
|
|||
Loading…
Reference in New Issue