X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=nodemanager-lib.spec;h=24e688d756d48b18b043a5efdfa7a24f90a963d8;hb=ac8187d5ee8c4c5781ea16af038bdb2818607bfa;hp=5b1fef678e1b9dc4038888a066d918f3abdc9bd8;hpb=4156fbf0aeb1b303e9498affe4e3a39342088f56;p=nodemanager.git

diff --git a/nodemanager-lib.spec b/nodemanager-lib.spec
index 5b1fef6..24e688d 100644
--- a/nodemanager-lib.spec
+++ b/nodemanager-lib.spec
@@ -2,7 +2,7 @@
 
 %define name nodemanager-lib
 %define version 2.1
-%define taglevel 4
+%define taglevel 10
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 %global python_sitearch %( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" )
@@ -34,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
@@ -70,7 +72,6 @@ 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
-install -D -m 644 bwlimitlxc.py ${RPM_BUILD_ROOT}/${PYTHON_SITEARCH}/bwlimitlxc.py
 
 ##########
 %post
@@ -129,9 +130,28 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/logrotate.d/nodemanager
 /var/lib/
 /bin/sshsh
-%{python_sitearch}/bwlimitlxc.py*
 
 %changelog
+* Wed Sep 05 2012 Andy Bavier <acb@cs.princeton.edu> - nodemanager-2.1-10
+- Change to use new vsh (wrapper for lxcsu)
+
+* Fri Aug 31 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - 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 <thierry.parmentelat@sophia.inria.fr> - 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 <thierry.parmentelat@sophia.inria.fr> - nodemanager-2.1-7
+- bwlimitlxc now ships with plnode-utils
+
+* Mon Jul 09 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodemanager-2.1-6
+- set LD_PRELOAD for linux-containers nodes
+
+* Thu Jun 28 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodemanager-2.1-5
+- first complete version for vs and lxc - functional but not thoroughly tested though
+
 * Tue Jun 26 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodemanager-2.1-4
 - split packaging in 3 (lib, lxc, vs)
 - this tag will only work with lxc though