From 7c2f31c33e9399a4c49f95470cbe045393643746 Mon Sep 17 00:00:00 2001 From: "Manuel Amador (Rudd-O)" Date: Mon, 30 Aug 2010 01:37:12 -0700 Subject: [PATCH] We now have a premium scripts project. --- cloud.spec | 18 ++++++++++++++++++ debian/cloud-agent-scripts.install | 29 ++++++++++++++++++++++++++++- debian/cloud-premium.install | 8 ++++++++ wscript_build | 3 ++- 4 files changed, 56 insertions(+), 2 deletions(-) diff --git a/cloud.spec b/cloud.spec index 2a4ed4d8ae0..8a920b3dceb 100644 --- a/cloud.spec +++ b/cloud.spec @@ -485,6 +485,15 @@ fi %files agent-scripts %defattr(-,root,root,-) %{_libdir}/%{name}/agent/scripts/* +# maintain the following list in sync with files agent-scripts +%exclude %{_libdir}/%{name}/agent/scripts/vm/hypervisor/xenserver/check_heartbeat.sh +%exclude %{_libdir}/%{name}/agent/scripts/vm/hypervisor/xenserver/find_bond.sh +%exclude %{_libdir}/%{name}/agent/scripts/vm/hypervisor/xenserver/launch_hb.sh +%exclude %{_libdir}/%{name}/agent/scripts/vm/hypervisor/xenserver/setup_heartbeat_sr.sh +%exclude %{_libdir}/%{name}/agent/scripts/vm/hypervisor/xenserver/vmopspremium +%exclude %{_libdir}/%{name}/agent/scripts/vm/hypervisor/xenserver/xenheartbeat.sh +%exclude %{_libdir}/%{name}/agent/scripts/vm/hypervisor/xenserver/xenserver56/patch-premium +%exclude %{_libdir}/%{name}/agent/scripts/vm/hypervisor/xenserver/xs_cleanup.sh %{_libdir}/%{name}/agent/vms/systemvm.zip %{_libdir}/%{name}/agent/vms/systemvm.iso %doc README @@ -699,6 +708,15 @@ fi %{_libdir}/%{name}/agent/vms/systemvm-premium.iso %{_datadir}/%{name}/setup/create-database-premium.sql %{_datadir}/%{name}/setup/create-schema-premium.sql +# maintain the following list in sync with files agent-scripts +%{_libdir}/%{name}/agent/scripts/vm/hypervisor/xenserver/check_heartbeat.sh +%{_libdir}/%{name}/agent/scripts/vm/hypervisor/xenserver/find_bond.sh +%{_libdir}/%{name}/agent/scripts/vm/hypervisor/xenserver/launch_hb.sh +%{_libdir}/%{name}/agent/scripts/vm/hypervisor/xenserver/setup_heartbeat_sr.sh +%{_libdir}/%{name}/agent/scripts/vm/hypervisor/xenserver/vmopspremium +%{_libdir}/%{name}/agent/scripts/vm/hypervisor/xenserver/xenheartbeat.sh +%{_libdir}/%{name}/agent/scripts/vm/hypervisor/xenserver/xenserver56/patch-premium +%{_libdir}/%{name}/agent/scripts/vm/hypervisor/xenserver/xs_cleanup.sh %doc README %doc INSTALL %doc HACKING diff --git a/debian/cloud-agent-scripts.install b/debian/cloud-agent-scripts.install index 321e48109f9..5c448a8c15d 100644 --- a/debian/cloud-agent-scripts.install +++ b/debian/cloud-agent-scripts.install @@ -1,3 +1,30 @@ -/usr/lib/cloud/agent/scripts/* +/usr/lib/cloud/agent/scripts/installer/* +/usr/lib/cloud/agent/scripts/network/* +/usr/lib/cloud/agent/scripts/storage/* +/usr/lib/cloud/agent/scripts/util/* +/usr/lib/cloud/agent/scripts/vm/network/* +/usr/lib/cloud/agent/scripts/vm/pingtest.sh +/usr/lib/cloud/agent/scripts/vm/storage/* +/usr/lib/cloud/agent/scripts/vm/hypervisor/kvm/* +/usr/lib/cloud/agent/scripts/vm/hypervisor/versions.sh +/usr/lib/cloud/agent/scripts/vm/hypervisor/xen/* +/usr/lib/cloud/agent/scripts/vm/hypervisor/xenserver/hostvmstats.py +/usr/lib/cloud/agent/scripts/vm/hypervisor/xenserver/id_rsa.cloud +/usr/lib/cloud/agent/scripts/vm/hypervisor/xenserver/make_migratable.sh +/usr/lib/cloud/agent/scripts/vm/hypervisor/xenserver/network_info.sh +/usr/lib/cloud/agent/scripts/vm/hypervisor/xenserver/networkUsage.sh +/usr/lib/cloud/agent/scripts/vm/hypervisor/xenserver/prepsystemvm.sh +/usr/lib/cloud/agent/scripts/vm/hypervisor/xenserver/setup_iscsi.sh +/usr/lib/cloud/agent/scripts/vm/hypervisor/xenserver/setupxenserver.sh +/usr/lib/cloud/agent/scripts/vm/hypervisor/xenserver/vmops +/usr/lib/cloud/agent/scripts/vm/hypervisor/xenserver/vmopsSnapshot +/usr/lib/cloud/agent/scripts/vm/hypervisor/xenserver/xcpserver/* +/usr/lib/cloud/agent/scripts/vm/hypervisor/xenserver/xenserver56/cleanup.py +/usr/lib/cloud/agent/scripts/vm/hypervisor/xenserver/xenserver56/ISCSISR.py +/usr/lib/cloud/agent/scripts/vm/hypervisor/xenserver/xenserver56/LUNperVDI.py +/usr/lib/cloud/agent/scripts/vm/hypervisor/xenserver/xenserver56/nfs.py +/usr/lib/cloud/agent/scripts/vm/hypervisor/xenserver/xenserver56/NFSSR.py +/usr/lib/cloud/agent/scripts/vm/hypervisor/xenserver/xenserver56/patch +/usr/lib/cloud/agent/scripts/vm/hypervisor/xenserver/xenserver56/scsiutil.py /usr/lib/cloud/agent/vms/systemvm.zip /usr/lib/cloud/agent/vms/systemvm.iso diff --git a/debian/cloud-premium.install b/debian/cloud-premium.install index 7871a23243f..db394b490fa 100644 --- a/debian/cloud-premium.install +++ b/debian/cloud-premium.install @@ -5,3 +5,11 @@ /usr/share/cloud/setup/create-database-premium.sql /usr/share/cloud/setup/create-schema-premium.sql /usr/lib/cloud/agent/vms/systemvm-premium.iso +/usr/lib/cloud/agent/scripts/vm/hypervisor/xenserver/check_heartbeat.sh +/usr/lib/cloud/agent/scripts/vm/hypervisor/xenserver/find_bond.sh +/usr/lib/cloud/agent/scripts/vm/hypervisor/xenserver/launch_hb.sh +/usr/lib/cloud/agent/scripts/vm/hypervisor/xenserver/setup_heartbeat_sr.sh +/usr/lib/cloud/agent/scripts/vm/hypervisor/xenserver/vmopspremium +/usr/lib/cloud/agent/scripts/vm/hypervisor/xenserver/xenheartbeat.sh +/usr/lib/cloud/agent/scripts/vm/hypervisor/xenserver/xenserver56/patch-premium +/usr/lib/cloud/agent/scripts/vm/hypervisor/xenserver/xs_cleanup.sh diff --git a/wscript_build b/wscript_build index f59aa5aad87..996d63fd824 100644 --- a/wscript_build +++ b/wscript_build @@ -484,13 +484,14 @@ else: # =================== Subst / installation of agent scripts project ======== -src_files = Utils.to_list(filelist("scripts/**",flat=True)) +src_files = Utils.to_list(filelist("scripts/** cloudstack-proprietary/scripts/**",flat=True)) subst_files = [ x+".subst" for x in src_files ] inst_files = src_files for src,tgt,inst in zip(src_files,subst_files,inst_files): tgen = bld(features='subst', name='scriptssubst', source=src, target=tgt) tgen.dict = bld.env.get_merged_dict() bld.path.find_or_declare(tgt) + if inst.startswith("cloudstack-proprietary"): inst = inst[len("cloudstack-proprietary")+1:] bld.install_as("${AGENTLIBDIR}/%s"%inst, tgt, chmod=0755) # ================== End agent scripts ===================