cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anthon...@apache.org
Subject [1/3] git commit: updated refs/heads/4.2-workplace to ed5aaea
Date Wed, 13 Nov 2013 01:57:12 GMT
Updated Branches:
  refs/heads/4.2-workplace [created] ed5aaea41


Create a seperate directory in XS host to save scripts from  CS


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3d93563d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3d93563d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3d93563d

Branch: refs/heads/4.2-workplace
Commit: 3d93563d5b75a37e72bda1a05c4146579a2dab7f
Parents: 4cb3115
Author: Anthony Xu <anthony.xu@citrix.com>
Authored: Mon Nov 11 16:24:16 2013 -0800
Committer: Anthony Xu <anthony.xu@citrix.com>
Committed: Tue Nov 12 11:20:35 2013 -0800

----------------------------------------------------------------------
 .../xen/resource/CitrixResourceBase.java        |  6 ++
 .../create_privatetemplate_from_snapshot.sh     |  2 +-
 scripts/vm/hypervisor/xenserver/launch_hb.sh    |  4 +-
 scripts/vm/hypervisor/xenserver/ovs-pvlan       | 13 ++--
 .../xenserver/setup_heartbeat_file.sh           |  2 +-
 .../vm/hypervisor/xenserver/setupxenserver.sh   |  2 +-
 scripts/vm/hypervisor/xenserver/swiftxen        |  2 +-
 .../vm/hypervisor/xenserver/upgrade_snapshot.sh |  2 +-
 scripts/vm/hypervisor/xenserver/vmops           | 32 ++++-----
 scripts/vm/hypervisor/xenserver/vmopsSnapshot   |  2 +-
 scripts/vm/hypervisor/xenserver/vmopspremium    | 18 +++---
 scripts/vm/hypervisor/xenserver/xcpserver/patch | 58 ++++++++---------
 scripts/vm/hypervisor/xenserver/xenheartbeat.sh |  2 +-
 .../vm/hypervisor/xenserver/xenserver56/patch   | 58 ++++++++---------
 .../hypervisor/xenserver/xenserver56fp1/patch   | 58 ++++++++---------
 .../vm/hypervisor/xenserver/xenserver60/patch   | 68 ++++++++++----------
 16 files changed, 171 insertions(+), 158 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3d93563d/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index e3dbdd8..31c336b 100644
--- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -295,6 +295,7 @@ import com.cloud.utils.StringUtils;
 import com.cloud.utils.Ternary;
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.utils.net.NetUtils;
+import com.cloud.utils.ssh.SSHCmdHelper;
 import com.cloud.vm.DiskProfile;
 import com.cloud.vm.VirtualMachine;
 import com.cloud.vm.VirtualMachine.State;
@@ -5196,6 +5197,11 @@ public abstract class CitrixResourceBase implements ServerResource,
HypervisorRe
                 }
 
                 com.trilead.ssh2.Session session = sshConnection.openSession();
+                
+                String cmd = "mkdir -p /opt/cloudstack/bin";
+                if (!SSHCmdHelper.sshExecuteCmd(sshConnection, cmd)) {
+                    throw new CloudRuntimeException("Cannot create directory /opt/cloudstack/bin
on XenServer hosts");
+                }
                 SCPClient scp = new SCPClient(sshConnection);
 
                 List<File> files = getPatchFiles();

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3d93563d/scripts/vm/hypervisor/xenserver/create_privatetemplate_from_snapshot.sh
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/create_privatetemplate_from_snapshot.sh b/scripts/vm/hypervisor/xenserver/create_privatetemplate_from_snapshot.sh
index 93b8705..f170f69 100755
--- a/scripts/vm/hypervisor/xenserver/create_privatetemplate_from_snapshot.sh
+++ b/scripts/vm/hypervisor/xenserver/create_privatetemplate_from_snapshot.sh
@@ -96,7 +96,7 @@ if [ $? -ne 0 ]; then
   exit 0
 fi
 
-VHDUTIL="/opt/xensource/bin/vhd-util"
+VHDUTIL="/opt/cloudstack/bin/vhd-util"
 
 copyvhd()
 {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3d93563d/scripts/vm/hypervisor/xenserver/launch_hb.sh
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/launch_hb.sh b/scripts/vm/hypervisor/xenserver/launch_hb.sh
index b8a36a0..bde7fca 100755
--- a/scripts/vm/hypervisor/xenserver/launch_hb.sh
+++ b/scripts/vm/hypervisor/xenserver/launch_hb.sh
@@ -33,7 +33,7 @@ if [ -z $2 ]; then
   exit 3
 fi
 
-if [ ! -f /opt/xensource/bin/xenheartbeat.sh ]; then
+if [ ! -f /opt/cloudstack/bin/xenheartbeat.sh ]; then
   printf "Error: Unable to find xenheartbeat.sh to launch\n"
   exit 4
 fi
@@ -42,5 +42,5 @@ for psid in `ps -ef | grep xenheartbeat | grep -v grep | awk '{print $2}'`;
do
   kill $psid
 done
 
-nohup /opt/xensource/bin/xenheartbeat.sh $1 $2 >/dev/null 2>/dev/null &
+nohup /opt/cloudstack/bin/xenheartbeat.sh $1 $2 >/dev/null 2>/dev/null &
 echo "======> DONE <======"

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3d93563d/scripts/vm/hypervisor/xenserver/ovs-pvlan
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/ovs-pvlan b/scripts/vm/hypervisor/xenserver/ovs-pvlan
index c821870..e1e537f 100755
--- a/scripts/vm/hypervisor/xenserver/ovs-pvlan
+++ b/scripts/vm/hypervisor/xenserver/ovs-pvlan
@@ -30,13 +30,16 @@ import util
 
 from time import localtime as _localtime, asctime as _asctime
 
+CS_DIR = "/opt/cloudstack/bin/"
+
 xePath = "/opt/xensource/bin/xe"
+dhcpSetupPath = CS_DIR + "ovs-pvlan-dhcp-host.sh"
+vmSetupPath = CS_DIR + "ovs-pvlan-vm.sh"
+getDhcpIfacePath = CS_DIR + "ovs-get-dhcp-iface.sh"
+pvlanCleanupPath = CS_DIR + "ovs-pvlan-cleanup.sh"
+getBridgePath = CS_DIR + "ovs-get-bridge.sh"
+
 lib.setup_logging("/var/log/ovs-pvlan.log")
-dhcpSetupPath = "/opt/xensource/bin/ovs-pvlan-dhcp-host.sh"
-vmSetupPath = "/opt/xensource/bin/ovs-pvlan-vm.sh"
-getDhcpIfacePath = "/opt/xensource/bin/ovs-get-dhcp-iface.sh"
-pvlanCleanupPath = "/opt/xensource/bin/ovs-pvlan-cleanup.sh"
-getBridgePath = "/opt/xensource/bin/ovs-get-bridge.sh"
 
 def echo(fn):
     def wrapped(*v, **k):

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3d93563d/scripts/vm/hypervisor/xenserver/setup_heartbeat_file.sh
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/setup_heartbeat_file.sh b/scripts/vm/hypervisor/xenserver/setup_heartbeat_file.sh
index fb178e0..fdb3099 100755
--- a/scripts/vm/hypervisor/xenserver/setup_heartbeat_file.sh
+++ b/scripts/vm/hypervisor/xenserver/setup_heartbeat_file.sh
@@ -58,7 +58,7 @@ if [ `xe pbd-list sr-uuid=$2 | grep -B 1 $1 | wc -l` -eq 0 ]; then
   exit 0
 fi
 
-hbfile=/opt/xensource/bin/heartbeat
+hbfile=/opt/cloudstack/bin/heartbeat
 
 if [ "$3" = "true" ]; then
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3d93563d/scripts/vm/hypervisor/xenserver/setupxenserver.sh
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/setupxenserver.sh b/scripts/vm/hypervisor/xenserver/setupxenserver.sh
index 311f273..61ce90b 100755
--- a/scripts/vm/hypervisor/xenserver/setupxenserver.sh
+++ b/scripts/vm/hypervisor/xenserver/setupxenserver.sh
@@ -55,7 +55,7 @@ mv -n /etc/cron.daily/logrotate /etc/cron.hourly 2>&1
 echo 1048576 >/proc/sys/fs/aio-max-nr
 
 # empty heartbeat
-cat /dev/null > /opt/xensource/bin/heartbeat
+cat /dev/null > /opt/cloudstack/bin/heartbeat
 # empty knownhost
 cat /dev/null > /root/.ssh/known_hosts
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3d93563d/scripts/vm/hypervisor/xenserver/swiftxen
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/swiftxen b/scripts/vm/hypervisor/xenserver/swiftxen
index 1be4107..b9ede19 100644
--- a/scripts/vm/hypervisor/xenserver/swiftxen
+++ b/scripts/vm/hypervisor/xenserver/swiftxen
@@ -34,7 +34,7 @@ def echo(fn):
         return res
     return wrapped
 
-SWIFT = "/opt/xensource/bin/swift"
+SWIFT = "/opt/cloudstack/bin/swift"
 
 MAX_SEG_SIZE = 5 * 1024 * 1024 * 1024
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3d93563d/scripts/vm/hypervisor/xenserver/upgrade_snapshot.sh
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/upgrade_snapshot.sh b/scripts/vm/hypervisor/xenserver/upgrade_snapshot.sh
index 6dcc2c4..b2e8685 100755
--- a/scripts/vm/hypervisor/xenserver/upgrade_snapshot.sh
+++ b/scripts/vm/hypervisor/xenserver/upgrade_snapshot.sh
@@ -87,7 +87,7 @@ if [ $? -ne 0 ]; then
   exit 0
 fi
 
-VHDUTIL="/opt/xensource/bin/vhd-util"
+VHDUTIL="/opt/cloudstack/bin/vhd-util"
 
 upgradeSnapshot()
 {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3d93563d/scripts/vm/hypervisor/xenserver/vmops
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/vmops b/scripts/vm/hypervisor/xenserver/vmops
index 48ca422..4f57271 100755
--- a/scripts/vm/hypervisor/xenserver/vmops
+++ b/scripts/vm/hypervisor/xenserver/vmops
@@ -32,6 +32,8 @@ import subprocess
 import zlib
 from util import CommandException
 
+CS_DIR="/opt/cloudstack/bin/"
+
 def echo(fn):
     def wrapped(*v, **k):
         name = fn.__name__
@@ -47,7 +49,7 @@ def add_to_VCPUs_params_live(session, args):
     value = args['value']
     vmname = args['vmname']
     try:
-        cmd = ["bash", "/opt/xensource/bin/add_to_vcpus_params_live.sh", vmname, key, value]
+        cmd = ["bash", CS_DIR + "add_to_vcpus_params_live.sh", vmname, key, value]
         txt = util.pread2(cmd)
     except:
         return 'false'
@@ -57,7 +59,7 @@ def add_to_VCPUs_params_live(session, args):
 def setup_iscsi(session, args):
    uuid=args['uuid']
    try:
-       cmd = ["bash", "/opt/xensource/bin/setup_iscsi.sh", uuid]
+       cmd = ["bash", CS_DIR + "setup_iscsi.sh", uuid]
        txt = util.pread2(cmd)
    except:
        txt = ''
@@ -68,7 +70,7 @@ def setup_iscsi(session, args):
 def getgateway(session, args):
     mgmt_ip = args['mgmtIP']
     try:
-        cmd = ["bash", "/opt/xensource/bin/network_info.sh", "-g", mgmt_ip]
+        cmd = ["bash", CS_DIR + "network_info.sh", "-g", mgmt_ip]
         txt = util.pread2(cmd)
     except:
         txt = ''
@@ -79,7 +81,7 @@ def getgateway(session, args):
 def preparemigration(session, args):
     uuid = args['uuid']
     try:
-        cmd = ["/opt/xensource/bin/make_migratable.sh", uuid]
+        cmd = [CS_DIR + "make_migratable.sh", uuid]
         util.pread2(cmd)
         txt = 'success'
     except:
@@ -91,7 +93,7 @@ def preparemigration(session, args):
 @echo
 def setIptables(session, args):
     try:
-        cmd = ["/bin/bash", "/opt/xensource/bin/setupxenserver.sh"]
+        cmd = ["/bin/bash", CS_DIR + "setupxenserver.sh"]
         txt = util.pread2(cmd)
         txt = 'success'
     except:
@@ -120,7 +122,7 @@ def pingdomr(session, args):
 def kill_copy_process(session, args):
     namelabel = args['namelabel']
     try:
-        cmd = ["bash", "/opt/xensource/bin/kill_copy_process.sh", namelabel]
+        cmd = ["bash", CS_DIR + "kill_copy_process.sh", namelabel]
         txt = util.pread2(cmd)
     except:
         txt = 'false'
@@ -134,7 +136,7 @@ def pingxenserver(session, args):
 def pingtest(session, args):
     sargs = args['args']
     cmd = sargs.split(' ')
-    cmd.insert(0, "/opt/xensource/bin/pingtest.sh")
+    cmd.insert(0, CS_DIR + "pingtest.sh")
     cmd.insert(0, "/bin/bash")
     try:
         txt = util.pread2(cmd)
@@ -149,7 +151,7 @@ def pingtest(session, args):
 def savePassword(session, args):
     sargs = args['args']
     cmd = sargs.split(' ')
-    cmd.insert(0, "/opt/xensource/bin/save_password_to_domr.sh")
+    cmd.insert(0, CS_DIR + "save_password_to_domr.sh")
     cmd.insert(0, "/bin/bash")
     try:
         txt = util.pread2(cmd)
@@ -164,7 +166,7 @@ def savePassword(session, args):
 def saveDhcpEntry(session, args):
     sargs = args['args']
     cmd = sargs.split(' ')
-    cmd.insert(0, "/opt/xensource/bin/dhcp_entry.sh")
+    cmd.insert(0, CS_DIR + "dhcp_entry.sh")
     cmd.insert(0, "/bin/bash")
     try:
         txt = util.pread2(cmd)
@@ -226,7 +228,7 @@ def setLinkLocalIP(session, args):
 def setFirewallRule(session, args):
     sargs = args['args']
     cmd = sargs.split(' ')
-    cmd.insert(0, "/opt/xensource/bin/call_firewall.sh")
+    cmd.insert(0, CS_DIR + "call_firewall.sh")
     cmd.insert(0, "/bin/bash")
     try:
         txt = util.pread2(cmd)
@@ -241,7 +243,7 @@ def setFirewallRule(session, args):
 def routerProxy(session, args):
     sargs = args['args']
     cmd = sargs.split(' ')
-    cmd.insert(0, "/opt/xensource/bin/router_proxy.sh")
+    cmd.insert(0, CS_DIR + "router_proxy.sh")
     cmd.insert(0, "/bin/bash")
     try:
         txt = util.pread2(cmd)
@@ -259,7 +261,7 @@ def routerProxy(session, args):
 def setLoadBalancerRule(session, args):
     sargs = args['args']
     cmd = sargs.split(' ')
-    cmd.insert(0, "/opt/xensource/bin/call_loadbalancer.sh")
+    cmd.insert(0, CS_DIR + "call_loadbalancer.sh")
     cmd.insert(0, "/bin/bash")
     try:
         txt = util.pread2(cmd)
@@ -286,7 +288,7 @@ def configdnsmasq(session, args):
 def createipAlias(session, args):
     args = args['args']
     cmd = args.split(' ')
-    cmd.insert(0, "/opt/xensource/bin/createipAlias.sh")
+    cmd.insert(0, CS_DIR + "createipAlias.sh")
     cmd.insert(0, "bin/bash")
     try:
        txt=util.pread2(cmd)
@@ -300,7 +302,7 @@ def createipAlias(session, args):
 def deleteipAlias(session, args):
     args = args['args']
     cmd = args.split(' ')
-    cmd.insert(0, "/opt/xensource/bin/deleteipAlias.sh")
+    cmd.insert(0, CS_DIR + "deleteipAlias.sh")
     cmd.insert(0, "bin/bash")
     try:
        txt=util.pread2(cmd)
@@ -1606,7 +1608,7 @@ def network_rules(session, args):
 def bumpUpPriority(session, args):
     sargs = args['args']
     cmd = sargs.split(' ')
-    cmd.insert(0, "/opt/xensource/bin/bumpUpPriority.sh")
+    cmd.insert(0, CS_DIR + "bumpUpPriority.sh")
     cmd.insert(0, "/bin/bash")
     try:
         txt = util.pread2(cmd)

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3d93563d/scripts/vm/hypervisor/xenserver/vmopsSnapshot
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/vmopsSnapshot b/scripts/vm/hypervisor/xenserver/vmopsSnapshot
index f638de4..dc8e11d 100755
--- a/scripts/vm/hypervisor/xenserver/vmopsSnapshot
+++ b/scripts/vm/hypervisor/xenserver/vmopsSnapshot
@@ -35,7 +35,7 @@ import cleanup
 import stat
 import random
 
-VHD_UTIL = '/opt/xensource/bin/vhd-util'
+VHD_UTIL = '/opt/cloudstack/bin/vhd-util'
 VHD_PREFIX = 'VHD-'
 CLOUD_DIR = '/var/run/cloud_mount'
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3d93563d/scripts/vm/hypervisor/xenserver/vmopspremium
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/vmopspremium b/scripts/vm/hypervisor/xenserver/vmopspremium
index 38ec2e8..973c030 100755
--- a/scripts/vm/hypervisor/xenserver/vmopspremium
+++ b/scripts/vm/hypervisor/xenserver/vmopspremium
@@ -26,6 +26,8 @@ sys.path.append("/opt/xensource/sm/")
 import util
 import socket
 
+CS_DIR="/opt/cloudstack/bin/"
+
 def echo(fn):
     def wrapped(*v, **k):
         name = fn.__name__
@@ -52,7 +54,7 @@ def create_privatetemplate_from_snapshot(session, args):
     snapshotPath = args['snapshotPath']
     tmpltLocalDir = args['tmpltLocalDir']
     try:
-        cmd = ["bash", "/opt/xensource/bin/create_privatetemplate_from_snapshot.sh",snapshotPath,
templatePath, tmpltLocalDir]
+        cmd = ["bash", CS_DIR + "create_privatetemplate_from_snapshot.sh",snapshotPath, templatePath,
tmpltLocalDir]
         txt = util.pread2(cmd)
     except:
         txt = '10#failed'
@@ -63,7 +65,7 @@ def upgrade_snapshot(session, args):
     templatePath = args['templatePath']
     snapshotPath = args['snapshotPath']
     try:
-        cmd = ["bash", "/opt/xensource/bin/upgrate_snapshot.sh",snapshotPath, templatePath]
+        cmd = ["bash", CS_DIR + "upgrate_snapshot.sh",snapshotPath, templatePath]
         txt = util.pread2(cmd)
     except:
         txt = '10#failed'
@@ -75,7 +77,7 @@ def copy_vhd_to_secondarystorage(session, args):
     vdiuuid = args['vdiuuid']
     sruuid = args['sruuid']
     try:
-        cmd = ["bash", "/opt/xensource/bin/copy_vhd_to_secondarystorage.sh", mountpoint,
vdiuuid, sruuid]
+        cmd = ["bash", CS_DIR + "copy_vhd_to_secondarystorage.sh", mountpoint, vdiuuid, sruuid]
         txt = util.pread2(cmd)
     except:
         txt = '10#failed'
@@ -87,7 +89,7 @@ def copy_vhd_from_secondarystorage(session, args):
     sruuid = args['sruuid']
     namelabel = args['namelabel']
     try:
-        cmd = ["bash", "/opt/xensource/bin/copy_vhd_from_secondarystorage.sh", mountpoint,
sruuid, namelabel]
+        cmd = ["bash", CS_DIR + "copy_vhd_from_secondarystorage.sh", mountpoint, sruuid,
namelabel]
         txt = util.pread2(cmd)
     except:
         txt = '10#failed'
@@ -98,7 +100,7 @@ def setup_heartbeat_sr(session, args):
     host = args['host']
     sr = args['sr']
     try:
-        cmd = ["bash", "/opt/xensource/bin/setup_heartbeat_sr.sh", host, sr]
+        cmd = ["bash", CS_DIR + "setup_heartbeat_sr.sh", host, sr]
         txt = util.pread2(cmd)
     except:
         txt = ''
@@ -110,7 +112,7 @@ def setup_heartbeat_file(session, args):
     sr = args['sr']
     add = args['add']
     try:
-        cmd = ["bash", "/opt/xensource/bin/setup_heartbeat_file.sh", host, sr, add]
+        cmd = ["bash", CS_DIR + "setup_heartbeat_file.sh", host, sr, add]
         txt = util.pread2(cmd)
     except:
         txt = ''
@@ -121,7 +123,7 @@ def check_heartbeat(session, args):
     host = args['host']
     interval = args['interval']
     try:
-       cmd = ["bash", "/opt/xensource/bin/check_heartbeat.sh", host, interval]
+       cmd = ["bash", CS_DIR + "check_heartbeat.sh", host, interval]
        txt = util.pread2(cmd)
     except:
        txt=''
@@ -133,7 +135,7 @@ def heartbeat(session, args):
     host = args['host']
     interval = args['interval']
     try: 
-       cmd = ["/bin/bash", "/opt/xensource/bin/launch_hb.sh", host, interval]
+       cmd = ["/bin/bash", CS_DIR + "launch_hb.sh", host, interval]
        txt = util.pread2(cmd)
     except:
        txt='fail'

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3d93563d/scripts/vm/hypervisor/xenserver/xcpserver/patch
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/xcpserver/patch b/scripts/vm/hypervisor/xenserver/xcpserver/patch
index 443abc1..4188846 100644
--- a/scripts/vm/hypervisor/xenserver/xcpserver/patch
+++ b/scripts/vm/hypervisor/xenserver/xcpserver/patch
@@ -34,33 +34,33 @@ vmopsSnapshot=..,0755,/etc/xapi.d/plugins
 hostvmstats.py=..,0755,/opt/xensource/sm
 systemvm.iso=../../../../../vms,0644,/opt/xensource/packages/iso
 id_rsa.cloud=../../../systemvm,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
-pingtest.sh=../../..,0755,/opt/xensource/bin
-dhcp_entry.sh=../../../../network/domr/,0755,/opt/xensource/bin
-createipAlias.sh=..,0755,/opt/xensource/bin
-deleteipAlias.sh=..,0755,/opt/xensource/bin
-router_proxy.sh=../../../../network/domr/,0755,/opt/xensource/bin
-save_password_to_domr.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
-cloud-setup-bonding.sh=..,0755,/opt/xensource/bin
-copy_vhd_to_secondarystorage.sh=..,0755,/opt/xensource/bin
-copy_vhd_from_secondarystorage.sh=..,0755,/opt/xensource/bin
-setup_heartbeat_sr.sh=..,0755,/opt/xensource/bin
-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
-vhd-util=..,0755,/opt/xensource/bin
+network_info.sh=..,0755,/opt/cloudstack/bin
+setupxenserver.sh=..,0755,/opt/cloudstack/bin
+make_migratable.sh=..,0755,/opt/cloudstack/bin
+setup_iscsi.sh=..,0755,/opt/cloudstack/bin
+pingtest.sh=../../..,0755,/opt/cloudstack/bin
+dhcp_entry.sh=../../../../network/domr/,0755,/opt/cloudstack/bin
+createipAlias.sh=..,0755,/opt/cloudstack/bin
+deleteipAlias.sh=..,0755,/opt/cloudstack/bin
+router_proxy.sh=../../../../network/domr/,0755,/opt/cloudstack/bin
+save_password_to_domr.sh=../../../../network/domr/,0755,/opt/cloudstack/bin
+call_firewall.sh=../../../../network/domr/,0755,/opt/cloudstack/bin
+call_loadbalancer.sh=../../../../network/domr/,0755,/opt/cloudstack/bin
+cloud-setup-bonding.sh=..,0755,/opt/cloudstack/bin
+copy_vhd_to_secondarystorage.sh=..,0755,/opt/cloudstack/bin
+copy_vhd_from_secondarystorage.sh=..,0755,/opt/cloudstack/bin
+setup_heartbeat_sr.sh=..,0755,/opt/cloudstack/bin
+setup_heartbeat_file.sh=..,0755,/opt/cloudstack/bin
+check_heartbeat.sh=..,0755,/opt/cloudstack/bin
+xenheartbeat.sh=..,0755,/opt/cloudstack/bin
+launch_hb.sh=..,0755,/opt/cloudstack/bin
+vhd-util=..,0755,/opt/cloudstack/bin
 vmopspremium=..,0755,/etc/xapi.d/plugins
-create_privatetemplate_from_snapshot.sh=..,0755,/opt/xensource/bin
-upgrade_snapshot.sh=..,0755,/opt/xensource/bin
-cloud-clean-vlan.sh=..,0755,/opt/xensource/bin
-cloud-prepare-upgrade.sh=..,0755,/opt/xensource/bin
-getRouterStatus.sh=../../../../network/domr/,0755,/opt/xensource/bin
-bumpUpPriority.sh=../../../../network/domr/,0755,/opt/xensource/bin
-getDomRVersion.sh=../../../../network/domr/,0755,/opt/xensource/bin
-add_to_vcpus_params_live.sh=..,0755,/opt/xensource/bin
+create_privatetemplate_from_snapshot.sh=..,0755,/opt/cloudstack/bin
+upgrade_snapshot.sh=..,0755,/opt/cloudstack/bin
+cloud-clean-vlan.sh=..,0755,/opt/cloudstack/bin
+cloud-prepare-upgrade.sh=..,0755,/opt/cloudstack/bin
+getRouterStatus.sh=../../../../network/domr/,0755,/opt/cloudstack/bin
+bumpUpPriority.sh=../../../../network/domr/,0755,/opt/cloudstack/bin
+getDomRVersion.sh=../../../../network/domr/,0755,/opt/cloudstack/bin
+add_to_vcpus_params_live.sh=..,0755,/opt/cloudstack/bin

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3d93563d/scripts/vm/hypervisor/xenserver/xenheartbeat.sh
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/xenheartbeat.sh b/scripts/vm/hypervisor/xenserver/xenheartbeat.sh
index dd876ba..f875a3a 100755
--- a/scripts/vm/hypervisor/xenserver/xenheartbeat.sh
+++ b/scripts/vm/hypervisor/xenserver/xenheartbeat.sh
@@ -44,7 +44,7 @@ if [ $interval -gt $2 ]; then
   exit 3
 fi
 
-file=/opt/xensource/bin/heartbeat
+file=/opt/cloudstack/bin/heartbeat
 lastdate=$(($(date +%s) + $interval))
 
 while [ $(date +%s) -lt $(($lastdate + $2)) ]

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3d93563d/scripts/vm/hypervisor/xenserver/xenserver56/patch
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/xenserver56/patch b/scripts/vm/hypervisor/xenserver/xenserver56/patch
index db2de3e..da1670e 100644
--- a/scripts/vm/hypervisor/xenserver/xenserver56/patch
+++ b/scripts/vm/hypervisor/xenserver/xenserver56/patch
@@ -31,37 +31,37 @@ vmops=..,0755,/etc/xapi.d/plugins
 vmopsSnapshot=..,0755,/etc/xapi.d/plugins
 systemvm.iso=../../../../../vms,0644,/opt/xensource/packages/iso
 id_rsa.cloud=../../../systemvm,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
-cloud-setup-bonding.sh=..,0755,/opt/xensource/bin
-pingtest.sh=../../..,0755,/opt/xensource/bin
-createipAlias.sh=..,0755,/opt/xensource/bin
-deleteipAlias.sh=..,0755,/opt/xensource/bin
-dhcp_entry.sh=../../../../network/domr/,0755,/opt/xensource/bin
-save_password_to_domr.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
-router_proxy.sh=../../../../network/domr/,0755,/opt/xensource/bin
-copy_vhd_to_secondarystorage.sh=..,0755,/opt/xensource/bin
-copy_vhd_from_secondarystorage.sh=..,0755,/opt/xensource/bin
-kill_copy_process.sh=..,0755,/opt/xensource/bin
-setup_heartbeat_sr.sh=..,0755,/opt/xensource/bin
-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
-vhd-util=..,0755,/opt/xensource/bin
+network_info.sh=..,0755,/opt/cloudstack/bin
+setupxenserver.sh=..,0755,/opt/cloudstack/bin
+make_migratable.sh=..,0755,/opt/cloudstack/bin
+setup_iscsi.sh=..,0755,/opt/cloudstack/bin
+cloud-setup-bonding.sh=..,0755,/opt/cloudstack/bin
+pingtest.sh=../../..,0755,/opt/cloudstack/bin
+createipAlias.sh=..,0755,/opt/cloudstack/bin
+deleteipAlias.sh=..,0755,/opt/cloudstack/bin
+dhcp_entry.sh=../../../../network/domr/,0755,/opt/cloudstack/bin
+save_password_to_domr.sh=../../../../network/domr/,0755,/opt/cloudstack/bin
+call_firewall.sh=../../../../network/domr/,0755,/opt/cloudstack/bin
+call_loadbalancer.sh=../../../../network/domr/,0755,/opt/cloudstack/bin
+router_proxy.sh=../../../../network/domr/,0755,/opt/cloudstack/bin
+copy_vhd_to_secondarystorage.sh=..,0755,/opt/cloudstack/bin
+copy_vhd_from_secondarystorage.sh=..,0755,/opt/cloudstack/bin
+kill_copy_process.sh=..,0755,/opt/cloudstack/bin
+setup_heartbeat_sr.sh=..,0755,/opt/cloudstack/bin
+setup_heartbeat_file.sh=..,0755,/opt/cloudstack/bin
+check_heartbeat.sh=..,0755,/opt/cloudstack/bin
+xenheartbeat.sh=..,0755,/opt/cloudstack/bin
+launch_hb.sh=..,0755,/opt/cloudstack/bin
+vhd-util=..,0755,/opt/cloudstack/bin
 vmopspremium=..,0755,/etc/xapi.d/plugins
 InterfaceReconfigure.py=.,0755,/opt/xensource/libexec
-create_privatetemplate_from_snapshot.sh=..,0755,/opt/xensource/bin
-upgrade_snapshot.sh=..,0755,/opt/xensource/bin
-cloud-clean-vlan.sh=..,0755,/opt/xensource/bin
-cloud-prepare-upgrade.sh=..,0755,/opt/xensource/bin
-bumpUpPriority.sh=../../../../network/domr/,0755,/opt/xensource/bin
-swift=..,0755,/opt/xensource/bin
+create_privatetemplate_from_snapshot.sh=..,0755,/opt/cloudstack/bin
+upgrade_snapshot.sh=..,0755,/opt/cloudstack/bin
+cloud-clean-vlan.sh=..,0755,/opt/cloudstack/bin
+cloud-prepare-upgrade.sh=..,0755,/opt/cloudstack/bin
+bumpUpPriority.sh=../../../../network/domr/,0755,/opt/cloudstack/bin
+swift=..,0755,/opt/cloudstack/bin
 swiftxen=..,0755,/etc/xapi.d/plugins
 s3xen=..,0755,/etc/xapi.d/plugins
-add_to_vcpus_params_live.sh=..,0755,/opt/xensource/bin
+add_to_vcpus_params_live.sh=..,0755,/opt/cloudstack/bin
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3d93563d/scripts/vm/hypervisor/xenserver/xenserver56fp1/patch
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/xenserver56fp1/patch b/scripts/vm/hypervisor/xenserver/xenserver56fp1/patch
index 3206a34..ecd4378 100644
--- a/scripts/vm/hypervisor/xenserver/xenserver56fp1/patch
+++ b/scripts/vm/hypervisor/xenserver/xenserver56fp1/patch
@@ -31,36 +31,36 @@ vmops=..,0755,/etc/xapi.d/plugins
 vmopsSnapshot=..,0755,/etc/xapi.d/plugins
 systemvm.iso=../../../../../vms,0644,/opt/xensource/packages/iso
 id_rsa.cloud=../../../systemvm,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
-pingtest.sh=../../..,0755,/opt/xensource/bin
-createipAlias.sh=..,0755,/opt/xensource/bin
-deleteipAlias.sh=..,0755,/opt/xensource/bin
-dhcp_entry.sh=../../../../network/domr/,0755,/opt/xensource/bin
-save_password_to_domr.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
-router_proxy.sh=../../../../network/domr/,0755,/opt/xensource/bin
-cloud-setup-bonding.sh=..,0755,/opt/xensource/bin
-copy_vhd_to_secondarystorage.sh=..,0755,/opt/xensource/bin
-copy_vhd_from_secondarystorage.sh=..,0755,/opt/xensource/bin
-kill_copy_process.sh=..,0755,/opt/xensource/bin
-setup_heartbeat_sr.sh=..,0755,/opt/xensource/bin
-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
-vhd-util=..,0755,/opt/xensource/bin
+network_info.sh=..,0755,/opt/cloudstack/bin
+setupxenserver.sh=..,0755,/opt/cloudstack/bin
+make_migratable.sh=..,0755,/opt/cloudstack/bin
+setup_iscsi.sh=..,0755,/opt/cloudstack/bin
+pingtest.sh=../../..,0755,/opt/cloudstack/bin
+createipAlias.sh=..,0755,/opt/cloudstack/bin
+deleteipAlias.sh=..,0755,/opt/cloudstack/bin
+dhcp_entry.sh=../../../../network/domr/,0755,/opt/cloudstack/bin
+save_password_to_domr.sh=../../../../network/domr/,0755,/opt/cloudstack/bin
+call_firewall.sh=../../../../network/domr/,0755,/opt/cloudstack/bin
+call_loadbalancer.sh=../../../../network/domr/,0755,/opt/cloudstack/bin
+router_proxy.sh=../../../../network/domr/,0755,/opt/cloudstack/bin
+cloud-setup-bonding.sh=..,0755,/opt/cloudstack/bin
+copy_vhd_to_secondarystorage.sh=..,0755,/opt/cloudstack/bin
+copy_vhd_from_secondarystorage.sh=..,0755,/opt/cloudstack/bin
+kill_copy_process.sh=..,0755,/opt/cloudstack/bin
+setup_heartbeat_sr.sh=..,0755,/opt/cloudstack/bin
+setup_heartbeat_file.sh=..,0755,/opt/cloudstack/bin
+check_heartbeat.sh=..,0755,/opt/cloudstack/bin
+xenheartbeat.sh=..,0755,/opt/cloudstack/bin
+launch_hb.sh=..,0755,/opt/cloudstack/bin
+vhd-util=..,0755,/opt/cloudstack/bin
 vmopspremium=..,0755,/etc/xapi.d/plugins
-create_privatetemplate_from_snapshot.sh=..,0755,/opt/xensource/bin
-upgrade_snapshot.sh=..,0755,/opt/xensource/bin
-cloud-clean-vlan.sh=..,0755,/opt/xensource/bin
-cloud-prepare-upgrade.sh=..,0755,/opt/xensource/bin
-bumpUpPriority.sh=../../../../network/domr/,0755,/opt/xensource/bin
-swift=..,0755,/opt/xensource/bin
+create_privatetemplate_from_snapshot.sh=..,0755,/opt/cloudstack/bin
+upgrade_snapshot.sh=..,0755,/opt/cloudstack/bin
+cloud-clean-vlan.sh=..,0755,/opt/cloudstack/bin
+cloud-prepare-upgrade.sh=..,0755,/opt/cloudstack/bin
+bumpUpPriority.sh=../../../../network/domr/,0755,/opt/cloudstack/bin
+swift=..,0755,/opt/cloudstack/bin
 swiftxen=..,0755,/etc/xapi.d/plugins
 s3xen=..,0755,/etc/xapi.d/plugins
-add_to_vcpus_params_live.sh=..,0755,/opt/xensource/bin
+add_to_vcpus_params_live.sh=..,0755,/opt/cloudstack/bin
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3d93563d/scripts/vm/hypervisor/xenserver/xenserver60/patch
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/xenserver60/patch b/scripts/vm/hypervisor/xenserver/xenserver60/patch
index 457bb26..049c22a 100644
--- a/scripts/vm/hypervisor/xenserver/xenserver60/patch
+++ b/scripts/vm/hypervisor/xenserver/xenserver60/patch
@@ -36,41 +36,41 @@ ovstunnel=..,0755,/etc/xapi.d/plugins
 vmopsSnapshot=..,0755,/etc/xapi.d/plugins
 systemvm.iso=../../../../../vms,0644,/opt/xensource/packages/iso
 id_rsa.cloud=../../../systemvm,0600,/root/.ssh
-network_info.sh=..,0755,/opt/xensource/bin
-setupxenserver.sh=..,0755,/opt/xensource/bin
-make_migratable.sh=..,0755,/opt/xensource/bin
-createipAlias.sh=..,0755,/opt/xensource/bin
-deleteipAlias.sh=..,0755,/opt/xensource/bin
-setup_iscsi.sh=..,0755,/opt/xensource/bin
-pingtest.sh=../../..,0755,/opt/xensource/bin
-dhcp_entry.sh=../../../../network/domr/,0755,/opt/xensource/bin
-save_password_to_domr.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
-router_proxy.sh=../../../../network/domr/,0755,/opt/xensource/bin
-cloud-setup-bonding.sh=..,0755,/opt/xensource/bin
-copy_vhd_to_secondarystorage.sh=..,0755,/opt/xensource/bin
-copy_vhd_from_secondarystorage.sh=..,0755,/opt/xensource/bin
-kill_copy_process.sh=..,0755,/opt/xensource/bin
-setup_heartbeat_sr.sh=..,0755,/opt/xensource/bin
-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
-vhd-util=..,0755,/opt/xensource/bin
+network_info.sh=..,0755,/opt/cloudstack/bin
+setupxenserver.sh=..,0755,/opt/cloudstack/bin
+make_migratable.sh=..,0755,/opt/cloudstack/bin
+createipAlias.sh=..,0755,/opt/cloudstack/bin
+deleteipAlias.sh=..,0755,/opt/cloudstack/bin
+setup_iscsi.sh=..,0755,/opt/cloudstack/bin
+pingtest.sh=../../..,0755,/opt/cloudstack/bin
+dhcp_entry.sh=../../../../network/domr/,0755,/opt/cloudstack/bin
+save_password_to_domr.sh=../../../../network/domr/,0755,/opt/cloudstack/bin
+call_firewall.sh=../../../../network/domr/,0755,/opt/cloudstack/bin
+call_loadbalancer.sh=../../../../network/domr/,0755,/opt/cloudstack/bin
+router_proxy.sh=../../../../network/domr/,0755,/opt/cloudstack/bin
+cloud-setup-bonding.sh=..,0755,/opt/cloudstack/bin
+copy_vhd_to_secondarystorage.sh=..,0755,/opt/cloudstack/bin
+copy_vhd_from_secondarystorage.sh=..,0755,/opt/cloudstack/bin
+kill_copy_process.sh=..,0755,/opt/cloudstack/bin
+setup_heartbeat_sr.sh=..,0755,/opt/cloudstack/bin
+setup_heartbeat_file.sh=..,0755,/opt/cloudstack/bin
+check_heartbeat.sh=..,0755,/opt/cloudstack/bin
+xenheartbeat.sh=..,0755,/opt/cloudstack/bin
+launch_hb.sh=..,0755,/opt/cloudstack/bin
+vhd-util=..,0755,/opt/cloudstack/bin
 vmopspremium=..,0755,/etc/xapi.d/plugins
-create_privatetemplate_from_snapshot.sh=..,0755,/opt/xensource/bin
-upgrade_snapshot.sh=..,0755,/opt/xensource/bin
-cloud-clean-vlan.sh=..,0755,/opt/xensource/bin
-cloud-prepare-upgrade.sh=..,0755,/opt/xensource/bin
-bumpUpPriority.sh=../../../../network/domr/,0755,/opt/xensource/bin
-swift=..,0755,/opt/xensource/bin
+create_privatetemplate_from_snapshot.sh=..,0755,/opt/cloudstack/bin
+upgrade_snapshot.sh=..,0755,/opt/cloudstack/bin
+cloud-clean-vlan.sh=..,0755,/opt/cloudstack/bin
+cloud-prepare-upgrade.sh=..,0755,/opt/cloudstack/bin
+bumpUpPriority.sh=../../../../network/domr/,0755,/opt/cloudstack/bin
+swift=..,0755,/opt/cloudstack/bin
 swiftxen=..,0755,/etc/xapi.d/plugins
 s3xen=..,0755,/etc/xapi.d/plugins
-add_to_vcpus_params_live.sh=..,0755,/opt/xensource/bin
+add_to_vcpus_params_live.sh=..,0755,/opt/cloudstack/bin
 ovs-pvlan=..,0755,/etc/xapi.d/plugins
-ovs-pvlan-dhcp-host.sh=../../../network,0755,/opt/xensource/bin
-ovs-pvlan-vm.sh=../../../network,0755,/opt/xensource/bin
-ovs-pvlan-cleanup.sh=../../../network,0755,/opt/xensource/bin
-ovs-get-dhcp-iface.sh=..,0755,/opt/xensource/bin
-ovs-get-bridge.sh=..,0755,/opt/xensource/bin
+ovs-pvlan-dhcp-host.sh=../../../network,0755,/opt/cloudstack/bin
+ovs-pvlan-vm.sh=../../../network,0755,/opt/cloudstack/bin
+ovs-pvlan-cleanup.sh=../../../network,0755,/opt/cloudstack/bin
+ovs-get-dhcp-iface.sh=..,0755,/opt/cloudstack/bin
+ovs-get-bridge.sh=..,0755,/opt/cloudstack/bin


Mime
View raw message