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

bug 14224: allowing Xenserver 6.0.2, with the assumption that the same patches and guest os type will work as with 6.0

This commit is contained in:
abhi 2012-03-09 17:34:27 +05:30
parent 87a32a4866
commit 64eb2dfcb1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
View File

@ -413,7 +413,7 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L
if(prodBrand.equals("XenServer") && prodVersion.equals("5.6.0"))
return new XenServer56Resource();
if(prodBrand.equals("XenServer") && prodVersion.equals("6.0.0"))
if(prodBrand.equals("XenServer") && prodVersion.startsWith("6.0"))
return new XenServer600Resource();
if(prodBrand.equals("XenServer") && prodVersion.equals("5.6.100")) {
@ -425,7 +425,7 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L
}
}
String msg = "Only support XCP 1.0.0, XCP 1.1.0, XenServer 5.6, XenServer 5.6 FP1 and XenServer 5.6 SP2, but this one is " + prodBrand + " " + prodVersion;
String msg = "Only support XCP 1.0.0, XCP 1.1.0, XenServer 5.6, XenServer 5.6 FP1, XenServer 5.6 SP2, Xenserver 6.0 but this one is " + prodBrand + " " + prodVersion;
_alertMgr.sendAlert(AlertManager.ALERT_TYPE_HOST, dcId, podId, msg, msg);
s_logger.debug(msg);
throw new RuntimeException(msg);