X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=nodemanager-lib.spec;h=01f502a670a2d51c47cd28032481332205c5a06a;hb=3302ed1e36638af300d31dda31348c951b92211a;hp=0178b49e74d0310aa20cd6b1622ab29bfcd5b3a5;hpb=fe04674a63c66ff26cb3875dd9aa1a3ea2f846cd;p=nodemanager.git diff --git a/nodemanager-lib.spec b/nodemanager-lib.spec index 0178b49..01f502a 100644 --- a/nodemanager-lib.spec +++ b/nodemanager-lib.spec @@ -2,10 +2,9 @@ %define name nodemanager-lib %define version 5.2 -%define taglevel 1 +%define taglevel 9 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} -%global python_sitearch %( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" ) Summary: PlanetLab Node Manager Library Name: %{name} @@ -46,32 +45,26 @@ local operations on slices. nodemanager-lib only provides a skeleton and needs as a companion either nodemanager-vs or nodemanager-lxc +# use initscripts or systemd unit files to start installed services +%if "%{distro}" == "Fedora" && %{distrorelease} >= 18 +%define make_options WITH_SYSTEMD=true +%define initdir /usr/lib/systemd/system +%else +%define make_options WITH_INIT=true +%define initdir %{_initrddir} +%endif + %prep %setup -q %build # make manages the C and Python stuff -%{__make} %{?_smp_mflags} lib +%{__make} %{?_smp_mflags} %{make_options} lib %install # make manages the C and Python stuff rm -rf $RPM_BUILD_ROOT -%{__make} %{?_smp_mflags} install-lib DESTDIR="$RPM_BUILD_ROOT" -PYTHON_SITEARCH=`python -c 'from distutils.sysconfig import get_python_lib; print get_python_lib(1)'` - -# install the sliver initscript (that triggers the slice initscript if any) -mkdir -p $RPM_BUILD_ROOT/usr/share/NodeManager/sliver-initscripts/ -rsync -av sliver-initscripts/ $RPM_BUILD_ROOT/usr/share/NodeManager/sliver-initscripts/ -chmod 755 $RPM_BUILD_ROOT/usr/share/NodeManager/sliver-initscripts/ - -mkdir -p $RPM_BUILD_ROOT/%{_initrddir}/ -rsync -av initscripts/ $RPM_BUILD_ROOT/%{_initrddir}/ -chmod 755 $RPM_BUILD_ROOT/%{_initrddir}/* - -install -d -m 755 $RPM_BUILD_ROOT/var/lib/nodemanager - -install -D -m 644 logrotate/nodemanager $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/nodemanager -install -D -m 755 sshsh $RPM_BUILD_ROOT/bin/sshsh +%{__make} %{?_smp_mflags} %{make_options} install-lib DESTDIR="$RPM_BUILD_ROOT" ########## %post @@ -126,12 +119,50 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %{_datadir}/NodeManager/ %{_bindir}/forward_api_calls -%{_initrddir}/ +%{initdir}/ %{_sysconfdir}/logrotate.d/nodemanager -/var/lib/ +/var/lib/nodemanager/ /bin/sshsh %changelog +* Wed Dec 11 2013 Thierry Parmentelat - nodemanager-5.2-9 +- fixes in hostmap, and in interfaces +- new vsys_sysctl +- privatebridge now comes with nodemanager-lib + +* Fri Sep 20 2013 Thierry Parmentelat - nodemanager-5.2-8 +- omf plugin does not block any longer when running trigger script +- log goes into sliver's /var/log instead + +* Wed Aug 28 2013 Thierry Parmentelat - nodemanager-5.2-7 +- new install-scripts target in Makefile +- conf_files and fuse-pl initscripts chmod'ed +x +- omf_resctl config template tweaked to use _slicename_%_hostname_ + +* Sun Jul 14 2013 Thierry Parmentelat - nodemanager-5.2-6 +- make sure to create /etc/planetlab/virt so others can read that +- expose get_node_virt() and command_in_slice() +- refined omf_resctl plugin (fetches trigger, and calls it on expire change) +- user's .profile now has right owner +- other tweaks in lxc slivers + +* Wed Jul 03 2013 Thierry Parmentelat - nodemanager-5.2-5 +- lxc slice creation: slice user was created with unknown gid - fixed +- lxc slice creation: .profile for root and user - fixed + +* Sat Jun 29 2013 Thierry Parmentelat - nodemanager-5.2-4 +- fix umounting of ssh directory when deleting omf-friendly slivers +- support for writing cgroups in subsystems other than cpuset +- add xid to template match +- finer-grained split between -lib -vs and -lxc +- first roughly complete omf_resctl for omfv6 +- minor fix for when getslivers does not have minexemptrate + +* Fri May 24 2013 Andy Bavier - nodemanager-5.2-3 +- Fix path, machine arch in slivers + +* Tue Apr 30 2013 Stephen Soltesz - nodemanager-5.2-2 + * Thu Mar 07 2013 Thierry Parmentelat - nodemanager-5.2-1 - no-op bump to 5.2 to be in line with the rest of the system @@ -464,12 +495,14 @@ rm -rf $RPM_BUILD_ROOT - Codemux supports multiple hosts mapping to single slice - Fixed bug in delegation support where tickets delivered weren't being passed to sm.deliver_ticket(). + * Fri Mar 28 2008 Faiyaz Ahmed - NodeManager-1.7-1 NodeManager-1.7-2 - Configures vsys via vsys slice attribute {name: vsys, value: script} - CPU reservations are now calculated via percentages instead of shares