X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=nodemanager-lib.spec;h=4c1793cefd316c52b25a94cfd7d8af0d7dd412f5;hb=4c938aadb49c8ffe5ab9ed6b528cdbbb0645ae6b;hp=eb547166179af935ebe0b94b57109d45c0456264;hpb=bf9ffbbab53c490871bd94002d01553567168a02;p=nodemanager.git diff --git a/nodemanager-lib.spec b/nodemanager-lib.spec index eb54716..4c1793c 100644 --- a/nodemanager-lib.spec +++ b/nodemanager-lib.spec @@ -1,10 +1,11 @@ %define slicefamily %{pldistro}-%{distroname}-%{_arch} %define name nodemanager-lib -%define version 2.0 -%define taglevel 38 +%define version 2.1 +%define taglevel 13 %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} @@ -33,6 +34,8 @@ Requires: gnupg Requires: pyplnet >= 4.3 # we do need the slice images in any case Requires: sliceimage-%{slicefamily} +# for bwlimit +Requires: plnode-utils %description The PlanetLab Node Manager manages all aspects of PlanetLab node and @@ -54,6 +57,7 @@ either nodemanager-vs or nodemanager-lxc # 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/ @@ -67,6 +71,7 @@ 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 ########## %post @@ -124,11 +129,54 @@ rm -rf $RPM_BUILD_ROOT %{_initrddir}/ %{_sysconfdir}/logrotate.d/nodemanager /var/lib/ +/bin/sshsh %changelog +* Tue Nov 13 2012 Andy Bavier - nodemanager-2.1-13 +- Bridge virtual interfaces to VLANs + +* Wed Oct 24 2012 Andy Bavier - nodemanager-2.1-12 +- Add support for L2 bridged interfaces with public IPs inside a slice + +* Thu Oct 18 2012 Scott Baker - nodemanager-2.1-11 +- Support for freezing BestEffort slices for Vicci + +* Wed Sep 05 2012 Andy Bavier - nodemanager-2.1-10 +- Change to use new vsh (wrapper for lxcsu) + +* Fri Aug 31 2012 Thierry Parmentelat - nodemanager-2.1-9 +- add missing import +- 2.1-8 is less broken than 2.1-7 for omf-friendly slices, in that the slivers would get created, but the OMF-feature probably won't work as .ssh won't get exposed to the sliver + +* Thu Aug 30 2012 Thierry Parmentelat - nodemanager-2.1-8 +- tag 2.1-7 was broken for OMF-friendly slices +- expose_ssh_dir was erroneously defined on the Worker class + +* Thu Jul 19 2012 Thierry Parmentelat - nodemanager-2.1-7 +- bwlimitlxc now ships with plnode-utils + +* Mon Jul 09 2012 Thierry Parmentelat - nodemanager-2.1-6 +- set LD_PRELOAD for linux-containers nodes + +* Thu Jun 28 2012 Thierry Parmentelat - nodemanager-2.1-5 +- first complete version for vs and lxc - functional but not thoroughly tested though + +* Tue Jun 26 2012 Thierry Parmentelat - nodemanager-2.1-4 +- split packaging in 3 (lib, lxc, vs) +- this tag will only work with lxc though + * Tue Jun 26 2012 Thierry Parmentelat - nodemanager-2.0-38 - split packaging, nodemanager-vs (obsoletes NodeManager) and nodemanager-lib +* Mon Jun 25 2012 Thierry Parmentelat - nodemanager-2.1-3 +- renamed bwlimit as bwlimitlxc to avoid conflicts with util-vserver-pl +- purpose being to be able to run this branch on vserver nodes as well + +* Thu Jun 21 2012 Thierry Parmentelat - nodemanager-2.1-2 +- merged nodemanager-2.0-37 in 2.1/lxc_devel and add initscript support to lxc +- passes tests with lxc but won't build against vs due to conflict +- as bwlimit.py also ships with util-vserver-pl + * Thu Jun 21 2012 Thierry Parmentelat - nodemanager-2.0-37 - refactoring: isolate initscript functionality - aimed at making initscript implementation with lxc straightforward @@ -138,6 +186,10 @@ rm -rf $RPM_BUILD_ROOT * Sun Jun 03 2012 Thierry Parmentelat - nodemanager-2.0-36 - /var/log/nodemanager shows duration of mainloop +* Fri Apr 13 2012 Thierry Parmentelat - nodemanager-2.1-1 +- first working draft for dealing with libvirt/lxc on f16 nodes +- not expected to work with mainline nodes (use 2.0 for that for now) + * Fri Apr 13 2012 Thierry Parmentelat - nodemanager-2.0-35 - remove Requires to deprecated vserver-* rpms, use sliceimage-* instead