use diffent dirs for oss scripts and premium scripts

This commit is contained in:
Frank Zhang 2010-12-03 19:39:22 -08:00
parent 5db4f229eb
commit 43a7bc6b0a
3 changed files with 3 additions and 39 deletions

View File

@ -451,15 +451,6 @@ fi
%defattr(-,root,root,-)
%{_libdir}/%{name}/agent/scripts/*
# maintain the following list in sync with files agent-scripts
%if %{_premium}
%exclude %{_libdir}/%{name}/agent/scripts/vm/hypervisor/xenserver/check_heartbeat.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
%endif
%{_libdir}/%{name}/agent/vms/systemvm.zip
%{_libdir}/%{name}/agent/vms/systemvm.iso
@ -594,13 +585,7 @@ fi
%{_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/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
%{_libdir}/%{name}/agent/premium-scripts/*
%files usage
%defattr(0644,root,root,0755)

View File

@ -7,21 +7,6 @@
/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/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/scripts/vm/hypervisor/xenserver/*
/usr/lib/cloud/agent/vms/systemvm.zip
/usr/lib/cloud/agent/vms/systemvm.iso

View File

@ -5,10 +5,4 @@
/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/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
/usr/lib/cloud/agent/premium-scripts/*