apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

create xenserver 5.6 patch file

Browse Source
This commit is contained in:
anthony 2010-12-17 20:21:28 -08:00
parent 44a8fdf918
commit baa6666897
4 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/cloud/hypervisor/xen/resource/XenServerResource.java
View File

@ -68,7 +68,7 @@ public class XenServerResource extends CitrixResourceBase {
@Override @Override
protected List<File> getPatchFiles() { protected List<File> getPatchFiles() {
List<File> files = new ArrayList<File>(); List<File> files = new ArrayList<File>();
String patch = "scripts/vm/hypervisor/xenserver/xenserver56/patch"; String patch = "scripts/vm/hypervisor/xenserver/xenserver56oss/patch";
String patchfilePath = Script.findScript("" , patch); String patchfilePath = Script.findScript("" , patch);
if ( patchfilePath == null ) { if ( patchfilePath == null ) {
throw new CloudRuntimeException("Unable to find patch file " + patch); throw new CloudRuntimeException("Unable to find patch file " + patch);

1
scripts/vm/hypervisor/xenserver/xenserver56/patch
View File

@ -13,7 +13,6 @@ NFSSR.py=/opt/xensource/sm
nfs.py=/opt/xensource/sm nfs.py=/opt/xensource/sm
vmops=..,0755,/etc/xapi.d/plugins vmops=..,0755,/etc/xapi.d/plugins
vmopsSnapshot=..,0755,/etc/xapi.d/plugins vmopsSnapshot=..,0755,/etc/xapi.d/plugins
systemvm.iso=../../../../../vms,0644,/opt/xensource/packages/iso
hostvmstats.py=..,0755,/opt/xensource/sm hostvmstats.py=..,0755,/opt/xensource/sm
id_rsa.cloud=..,0600,/root/.ssh id_rsa.cloud=..,0600,/root/.ssh
network_info.sh=..,0755,/opt/xensource/bin network_info.sh=..,0755,/opt/xensource/bin

32
scripts/vm/hypervisor/xenserver/xenserver56oss/patch Normal file
View File

@ -0,0 +1,32 @@
# This file specifies the files that need
# to be transferred over to the XenServer.
# The format of this file is as follows:
# [Name of file]=[source path],[file permission],[destination path]
# [destination path] is required.
# If [file permission] is missing, 755 is assumed.
# If [source path] is missing, it looks in the same
# directory as the patch file.
# If [source path] starts with '/', then it is absolute path.
# If [source path] starts with '~', then it is path relative to management server home directory.
# If [source path] does not start with '/' or '~', then it is relative path to the location of the patch file.
NFSSR.py=../xenserver56,755,/opt/xensource/sm
nfs.py=../xenserver56,755,/opt/xensource/sm
vmops=..,0755,/etc/xapi.d/plugins
vmopsSnapshot=..,0755,/etc/xapi.d/plugins
systemvm.iso=../../../../../vms,0644,/opt/xensource/packages/iso
hostvmstats.py=..,0755,/opt/xensource/sm
id_rsa.cloud=..,0600,/root/.ssh
network_info.sh=..,0755,/opt/xensource/bin
setupxenserver.sh=..,0755,/opt/xensource/bin
make_migratable.sh=..,0755,/opt/xensource/bin
setup_iscsi.sh=..,0755,/opt/xensource/bin
version=..,0755,/opt/xensource/bin
pingtest.sh=../../..,0755,/opt/xensource/bin
dhcp_entry.sh=../../../../network/domr/,0755,/opt/xensource/bin
ipassoc.sh=../../../../network/domr/,0755,/opt/xensource/bin
vm_data.sh=../../../../network/domr/,0755,/opt/xensource/bin
save_password_to_domr.sh=../../../../network/domr/,0755,/opt/xensource/bin
networkUsage.sh=../../../../network/domr/,0755,/opt/xensource/bin
call_firewall.sh=../../../../network/domr/,0755,/opt/xensource/bin
call_loadbalancer.sh=../../../../network/domr/,0755,/opt/xensource/bin
l2tp_vpn.sh=../../../../network/domr/,0755,/opt/xensource/bin

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

@ -375,7 +375,7 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L
if(prodBrand.equals("XenServer") && prodVersion.equals("5.6.0")) if(prodBrand.equals("XenServer") && prodVersion.equals("5.6.0"))
return new XenServerResource(); return new XenServerResource();
String msg = "Only support XCP 0.1.1 and XenServer 5.6.0, but this one is " + prodBrand + " " + prodVersion; String msg = "Only support XCP 0.1.1 and XenServer 5.6 , but this one is " + prodBrand + " " + prodVersion;
_alertMgr.sendAlert(AlertManager.ALERT_TYPE_HOST, dcId, podId, msg, msg); _alertMgr.sendAlert(AlertManager.ALERT_TYPE_HOST, dcId, podId, msg, msg);
s_logger.debug(msg); s_logger.debug(msg);
throw new RuntimeException(msg); throw new RuntimeException(msg);