cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anthon...@apache.org
Subject [1/3] put shell scripts to a seperate directory in XS use same scripts for both XS and XCP
Date Tue, 03 Dec 2013 10:05:58 GMT
Updated Branches:
  refs/heads/master 30db5d648 -> 5a062e155


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5a062e15/scripts/vm/hypervisor/xenserver/xenserver56/patch
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/xenserver56/patch b/scripts/vm/hypervisor/xenserver/xenserver56/patch
index 87b3937..e593a5c 100644
--- a/scripts/vm/hypervisor/xenserver/xenserver56/patch
+++ b/scripts/vm/hypervisor/xenserver/xenserver56/patch
@@ -32,37 +32,37 @@ 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
-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/cloud/bin
+setupxenserver.sh=..,0755,/opt/cloud/bin
+make_migratable.sh=..,0755,/opt/cloud/bin
+setup_iscsi.sh=..,0755,/opt/cloud/bin
+cloud-setup-bonding.sh=..,0755,/opt/cloud/bin
+pingtest.sh=../../..,0755,/opt/cloud/bin
+createipAlias.sh=..,0755,/opt/cloud/bin
+deleteipAlias.sh=..,0755,/opt/cloud/bin
+dhcp_entry.sh=../../../../network/domr/,0755,/opt/cloud/bin
+save_password_to_domr.sh=../../../../network/domr/,0755,/opt/cloud/bin
+call_firewall.sh=../../../../network/domr/,0755,/opt/cloud/bin
+call_loadbalancer.sh=../../../../network/domr/,0755,/opt/cloud/bin
+router_proxy.sh=../../../../network/domr/,0755,/opt/cloud/bin
+copy_vhd_to_secondarystorage.sh=..,0755,/opt/cloud/bin
+copy_vhd_from_secondarystorage.sh=..,0755,/opt/cloud/bin
+kill_copy_process.sh=..,0755,/opt/cloud/bin
+setup_heartbeat_sr.sh=..,0755,/opt/cloud/bin
+setup_heartbeat_file.sh=..,0755,/opt/cloud/bin
+check_heartbeat.sh=..,0755,/opt/cloud/bin
+xenheartbeat.sh=..,0755,/opt/cloud/bin
+launch_hb.sh=..,0755,/opt/cloud/bin
+vhd-util=..,0755,/opt/cloud/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/cloud/bin
+upgrade_snapshot.sh=..,0755,/opt/cloud/bin
+cloud-clean-vlan.sh=..,0755,/opt/cloud/bin
+cloud-prepare-upgrade.sh=..,0755,/opt/cloud/bin
+bumpUpPriority.sh=../../../../network/domr/,0755,/opt/cloud/bin
+swift=..,0755,/opt/cloud/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/cloud/bin
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5a062e15/scripts/vm/hypervisor/xenserver/xenserver56fp1/patch
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/xenserver56fp1/patch b/scripts/vm/hypervisor/xenserver/xenserver56fp1/patch
index 6dc9b05..b210a88 100644
--- a/scripts/vm/hypervisor/xenserver/xenserver56fp1/patch
+++ b/scripts/vm/hypervisor/xenserver/xenserver56fp1/patch
@@ -32,36 +32,36 @@ 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
-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/cloud/bin
+setupxenserver.sh=..,0755,/opt/cloud/bin
+make_migratable.sh=..,0755,/opt/cloud/bin
+setup_iscsi.sh=..,0755,/opt/cloud/bin
+pingtest.sh=../../..,0755,/opt/cloud/bin
+createipAlias.sh=..,0755,/opt/cloud/bin
+deleteipAlias.sh=..,0755,/opt/cloud/bin
+dhcp_entry.sh=../../../../network/domr/,0755,/opt/cloud/bin
+save_password_to_domr.sh=../../../../network/domr/,0755,/opt/cloud/bin
+call_firewall.sh=../../../../network/domr/,0755,/opt/cloud/bin
+call_loadbalancer.sh=../../../../network/domr/,0755,/opt/cloud/bin
+router_proxy.sh=../../../../network/domr/,0755,/opt/cloud/bin
+cloud-setup-bonding.sh=..,0755,/opt/cloud/bin
+copy_vhd_to_secondarystorage.sh=..,0755,/opt/cloud/bin
+copy_vhd_from_secondarystorage.sh=..,0755,/opt/cloud/bin
+kill_copy_process.sh=..,0755,/opt/cloud/bin
+setup_heartbeat_sr.sh=..,0755,/opt/cloud/bin
+setup_heartbeat_file.sh=..,0755,/opt/cloud/bin
+check_heartbeat.sh=..,0755,/opt/cloud/bin
+xenheartbeat.sh=..,0755,/opt/cloud/bin
+launch_hb.sh=..,0755,/opt/cloud/bin
+vhd-util=..,0755,/opt/cloud/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/cloud/bin
+upgrade_snapshot.sh=..,0755,/opt/cloud/bin
+cloud-clean-vlan.sh=..,0755,/opt/cloud/bin
+cloud-prepare-upgrade.sh=..,0755,/opt/cloud/bin
+bumpUpPriority.sh=../../../../network/domr/,0755,/opt/cloud/bin
+swift=..,0755,/opt/cloud/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/cloud/bin
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5a062e15/scripts/vm/hypervisor/xenserver/xenserver60/patch
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/xenserver60/patch b/scripts/vm/hypervisor/xenserver/xenserver60/patch
index 60a0643..8a0448a 100644
--- a/scripts/vm/hypervisor/xenserver/xenserver60/patch
+++ b/scripts/vm/hypervisor/xenserver/xenserver60/patch
@@ -37,41 +37,41 @@ 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
-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/cloud/bin
+setupxenserver.sh=..,0755,/opt/cloud/bin
+make_migratable.sh=..,0755,/opt/cloud/bin
+createipAlias.sh=..,0755,/opt/cloud/bin
+deleteipAlias.sh=..,0755,/opt/cloud/bin
+setup_iscsi.sh=..,0755,/opt/cloud/bin
+pingtest.sh=../../..,0755,/opt/cloud/bin
+dhcp_entry.sh=../../../../network/domr/,0755,/opt/cloud/bin
+save_password_to_domr.sh=../../../../network/domr/,0755,/opt/cloud/bin
+call_firewall.sh=../../../../network/domr/,0755,/opt/cloud/bin
+call_loadbalancer.sh=../../../../network/domr/,0755,/opt/cloud/bin
+router_proxy.sh=../../../../network/domr/,0755,/opt/cloud/bin
+cloud-setup-bonding.sh=..,0755,/opt/cloud/bin
+copy_vhd_to_secondarystorage.sh=..,0755,/opt/cloud/bin
+copy_vhd_from_secondarystorage.sh=..,0755,/opt/cloud/bin
+kill_copy_process.sh=..,0755,/opt/cloud/bin
+setup_heartbeat_sr.sh=..,0755,/opt/cloud/bin
+setup_heartbeat_file.sh=..,0755,/opt/cloud/bin
+check_heartbeat.sh=..,0755,/opt/cloud/bin
+xenheartbeat.sh=..,0755,/opt/cloud/bin
+launch_hb.sh=..,0755,/opt/cloud/bin
+vhd-util=..,0755,/opt/cloud/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/cloud/bin
+upgrade_snapshot.sh=..,0755,/opt/cloud/bin
+cloud-clean-vlan.sh=..,0755,/opt/cloud/bin
+cloud-prepare-upgrade.sh=..,0755,/opt/cloud/bin
+bumpUpPriority.sh=../../../../network/domr/,0755,/opt/cloud/bin
+swift=..,0755,/opt/cloud/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/cloud/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/cloud/bin
+ovs-pvlan-vm.sh=../../../network,0755,/opt/cloud/bin
+ovs-pvlan-cleanup.sh=../../../network,0755,/opt/cloud/bin
+ovs-get-dhcp-iface.sh=..,0755,/opt/cloud/bin
+ovs-get-bridge.sh=..,0755,/opt/cloud/bin


Mime
View raw message