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

merge setupxenserver

Browse Source
This commit is contained in:
anthony 2011-01-28 18:58:50 -08:00
parent 76ad02d2fa
commit 9e63416da3
6 changed files with 9 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/com/cloud/hypervisor/xen/resource/XenServer56Resource.java
View File

@ -492,7 +492,6 @@ public class XenServer56Resource extends CitrixResourceBase {
protected SetupAnswer execute(SetupCommand cmd) {
Connection conn = getConnection();
try {
callHostPluginPremium(conn, "setupXenServer");
cleanupTemplateSR(conn);
Host host = Host.getByUuid(conn, _host.uuid);
try {

13
scripts/vm/hypervisor/xenserver/setupXenServer.sh
View File

@ -1,13 +0,0 @@
#!/bin/bash
# avoid disk full
mv /etc/cron.daily/logrotate /etc/cron.hourly 2>&1
# more aio thread
echo 1048576 >/proc/sys/fs/aio-max-nr
# empty heartbeat
cat /dev/null > /opt/xensource/bin/heartbeat
echo "success"

8
scripts/vm/hypervisor/xenserver/setupxenserver.sh
View File

@ -21,5 +21,13 @@ sed -i 's/127\.0\.0\.1/0\.0\.0\.0/' /opt/xensource/libexec/qemu-dm-wrapper 2>&1
sed -i /NOZEROCONF/d /etc/sysconfig/network
echo "NOZEROCONF=yes" >> /etc/sysconfig/network
mv /etc/cron.daily/logrotate /etc/cron.hourly 2>&1
# more aio thread
echo 1048576 >/proc/sys/fs/aio-max-nr
# empty heartbeat
cat /dev/null > /opt/xensource/bin/heartbeat
echo "success"

13
scripts/vm/hypervisor/xenserver/vmopspremium
View File

@ -85,17 +85,6 @@ def heartbeat(session, args):
txt='fail'
return txt
@echo
def setupXenServer(session, args):
try:
cmd = ["/bin/bash", "/opt/xensource/bin/setupXenServer.sh"]
txt = util.pread2(cmd)
return txt
except:
raise xs_errors.XenError('setupXenServer.sh execution failed.')
if __name__ == "__main__":
XenAPIPlugin.dispatch({"copy_vhd_to_secondarystorage":copy_vhd_to_secondarystorage, "copy_vhd_from_secondarystorage":copy_vhd_from_secondarystorage, "setup_heartbeat_sr":setup_heartbeat_sr, "setup_heartbeat_file":setup_heartbeat_file, "check_heartbeat":check_heartbeat, "heartbeat": heartbeat, "setupXenServer":setupXenServer})
XenAPIPlugin.dispatch({"copy_vhd_to_secondarystorage":copy_vhd_to_secondarystorage, "copy_vhd_from_secondarystorage":copy_vhd_from_secondarystorage, "setup_heartbeat_sr":setup_heartbeat_sr, "setup_heartbeat_file":setup_heartbeat_file, "check_heartbeat":check_heartbeat, "heartbeat": heartbeat})

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

@ -38,7 +38,6 @@ setup_heartbeat_file.sh=..,0755,/opt/xensource/bin
check_heartbeat.sh=..,0755,/opt/xensource/bin
xenheartbeat.sh=..,0755,/opt/xensource/bin
launch_hb.sh=..,0755,/opt/xensource/bin
setupXenServer.sh=..,0755,/opt/xensource/bin
vmopspremium=..,0755,/etc/xapi.d/plugins
InterfaceReconfigure.py=.,0755,/opt/xensource/bin
fsimage.so=..,0755,/usr/lib/fs/ext2fs-lib

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

@ -40,5 +40,4 @@ setup_heartbeat_file.sh=..,0755,/opt/xensource/bin
check_heartbeat.sh=..,0755,/opt/xensource/bin
xenheartbeat.sh=..,0755,/opt/xensource/bin
launch_hb.sh=..,0755,/opt/xensource/bin
setupXenServer.sh=..,0755,/opt/xensource/bin
vmopspremium=..,0755,/etc/xapi.d/plugins