X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=NodeManager.spec;h=be9e623548c001592d2e871eec5eff0c17b50079;hb=8b14bf7e48b420f68ae13b1c4461bd3d1f5e5baa;hp=156a05e9ea7016a59ef388e13057348ce793960a;hpb=bc63ad56f556ddaacac8fbe02a87e08fe374a8cc;p=nodemanager.git diff --git a/NodeManager.spec b/NodeManager.spec index 156a05e..be9e623 100644 --- a/NodeManager.spec +++ b/NodeManager.spec @@ -6,7 +6,7 @@ %define slicefamily %{pldistro}-%{distroname}-%{_arch} %define name NodeManager -%define version 1.8 +%define version 2.0 %define taglevel 9 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} @@ -25,27 +25,24 @@ Packager: PlanetLab Central Distribution: PlanetLab %{plrelease} URL: %(echo %{url} | cut -d ' ' -f 2) -BuildArch: noarch +# not possible because of forward_api_calls +#BuildArch: noarch -# Old Node Manager -Obsoletes: sidewinder, sidewinder-common +# old name +#Obsoletes: sidewinder, sidewinder-common +# Uses function decorators +Requires: python >= 2.4 +# connecting PLC +Requires: python-pycurl +# Signed tickets +Requires: gnupg # vuseradd, vuserdel Requires: vserver-%{slicefamily} +# our interface to the vserver patch Requires: util-vserver >= 0.30.208-17 - # vserver.py Requires: util-vserver-python > 0.3-16 - -# Signed tickets -Requires: gnupg - -# Contact API server -Requires: curl - -# Uses function decorators -Requires: python >= 2.4 - # sioc/plnet Requires: pyplnet >= 4.3 @@ -60,18 +57,50 @@ local operations on slices. %setup -q %build +# make manages the C and Python stuff %{__make} %{?_smp_mflags} %install +# make manages the C and Python stuff rm -rf $RPM_BUILD_ROOT %{__make} %{?_smp_mflags} install DESTDIR="$RPM_BUILD_ROOT" -install -D -m 755 conf_files.init $RPM_BUILD_ROOT/%{_initrddir}/conf_files -install -D -m 755 fuse-pl.init $RPM_BUILD_ROOT/%{_initrddir}/fuse-pl -install -D -m 755 nm.init $RPM_BUILD_ROOT/%{_initrddir}/nm -install -D -m 644 nm.logrotate $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/nm +# 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 + +########## %post +# tmp - handle file renamings; old names are from 2.0-8 +renamings=" +/var/lib/misc/bwmon.dat@/var/lib/nodemanager/bwmon.pickle +/root/sliver_mgr_db.pickle@/var/lib/nodemanager/database.pickle +/var/log/getslivers.txt@/var/lib/nodemanager/getslivers.txt +/var/log/nm@/var/log/nodemanager +/var/log/nm.daemon@/var/log/nodemanager.daemon +/var/run/nm.pid@/var/run/nodemanager.pid +/tmp/sliver_mgr.api@/tmp/nodemanager.api +/etc/logrotate.d/nm@/etc/logrotate.d/nodemanager +" +for renaming in $renamings; do + old=$(echo $renaming | cut -d@ -f1) + new=$(echo $renaming | cut -d@ -f2) + newdir=$(dirname $new) + if [ -e "$old" -a ! -e "$new" ] ; then + mkdir -p $newdir + mv -f $old $new + fi +done +# chkconfig --add conf_files chkconfig conf_files on chkconfig --add nm @@ -83,7 +112,7 @@ if [ "$PL_BOOTCD" != "1" ] ; then service fuse-pl restart fi - +########## %preun # 0 = erase, 1 = upgrade if [ $1 -eq 0 ] ; then @@ -102,12 +131,120 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %{_datadir}/NodeManager/ %{_bindir}/forward_api_calls -%{_initrddir}/nm -%{_initrddir}/conf_files -%{_initrddir}/fuse-pl -%{_sysconfdir}/logrotate.d/nm +%{_initrddir}/ +%{_sysconfdir}/logrotate.d/nodemanager +/var/lib/ %changelog +* Wed Jun 16 2010 Thierry Parmentelat - NodeManager-2.0-9 +- fix for 64bits nodes: add newline to the personality files that instruct util-vserver to create 32bits slivers +- basic/partial support from reservable nodes through the 'reservation plugin' (not fully working yet) +- plugins can set 'persistent_data' to receive the latests know GetSlivers in case the connection is down +- cleanup: moved runtime files in /var/lib/nodemanager, and logs as /var/log/nodemanager* (see specfile) +- cleanup: some modules renamed (e.g. nm.py becomes nodemanager.py) +- cleanup: nodemanger now is a class; however plugins are still dumb modules +- cleanup: does not depend on obsolete Set + +* Fri May 14 2010 Talip Baris Metin - NodeManager-2.0-8 +- tagging before RC + +* Wed May 12 2010 S.Çağlar Onur - NodeManager-2.0-7 +- Fix typos in plugins/drl.py and doc/NMAPI.xml.in +- Added some precautions to the slice id-saving code +- Added log message to code that records the slice id + +* Mon Apr 26 2010 Sapan Bhatia - NodeManager-2.0-6 +- This version changes the location of the slice id for components such as PlanetFlow to look up. Previously this piece +- of information was stored in the 'vserver name' field of the per-vserver context structure in the kernel but we needed +- to move it elsewhere since Daniel decided to use that for something else (the vserver name... pedantic!). + +* Wed Apr 14 2010 Talip Baris Metin - NodeManager-2.0-5 +- fix log_call in plugins/drl.py + +* Fri Apr 02 2010 Thierry Parmentelat - NodeManager-2.0-4 +- protect against nodes in migrated PLC's not having the hrn tag yet + +* Fri Mar 12 2010 Thierry Parmentelat - NodeManager-2.0-3 +- new omf-resctl and drl plugins +- specialaccount optimized to overwrite authorized keys only upon changes +- codemux plugin has support for a new 'ip' setting +- mainloop to display ordered modules&plugins at all times + +* Thu Feb 11 2010 Thierry Parmentelat - NodeManager-2.0-2 +- modules and plugins have a priority +- specialaccounts appears soon in the priority chain +- logger.log_call logs process output, and has a timeout +- vuser{add,del} run through bash -x +- nm initscript has support for 'service nm restartverbose' +- logs reviewed for consistency +- use hashlib module instead of sha when available + +* Fri Jan 29 2010 Thierry Parmentelat - NodeManager-2.0-1 +- first working version of 5.0: +- pld.c/, db-config.d/ and nodeconfig/ scripts should now sit in the module they belong to +- nodefamily is 3-fold with pldistro-fcdistro-arch +- relies on GetSlivers to expose 'GetSliceFamily' for slivers +- (in addition to the 'vref' tag that's still exposed too) +- logging reviewed for more convenience +- support for 'service nm restartdebug' +- make sync knows how to publish uncommitted code on a test node + +* Tue Jan 12 2010 Thierry Parmentelat - NodeManager-1.8-23 +- emergency tag - make the setting of hmac by the sliverauth plugin more robust + +* Mon Jan 11 2010 Thierry Parmentelat - NodeManager-1.8-22 +- support for f10 and f12 in the vref slice tag + +* Sat Jan 09 2010 Thierry Parmentelat - NodeManager-1.8-21 +- build on fedora12 +- uses slicename 'sfacm' instead of 'genicw' + +* Fri Oct 30 2009 Sapan Bhatia - NodeManager-1.8-20 +- This tag is identical to 1.8-19. The main addition is PLC-controllable vsys scripts. The reason I am +- retagging is to eliminate any confusion associated with the -19 tag which was (temporarily) modified a few +- days ago. + +* Tue Oct 27 2009 Sapan Bhatia - NodeManager-1.8-19 +- This patch makes vsys scripts PLC-configurable. Previously, vsys scripts needed to be +- self-contained. With this change, they will be able to refer to the attributes associated with a +- slice. + +* Thu Oct 22 2009 Baris Metin - NodeManager-1.8-18 +- fix for syntax error + +* Wed Oct 21 2009 anil vengalil - NodeManager-1.8-17 +- -fixed problem with sioc import at the build side +- -bwlimit.set() now accepts the device and does not asume that it is eth0 + +* Tue Oct 20 2009 Baris Metin - NodeManager-1.8-16 +- - don't hardcode the device name (depends on util-vserver-pl change rev. 15385) + +* Fri Oct 09 2009 Marc Fiuczynski - NodeManager-1.8-15 +- The seed for random previously was the meaning of life (i.e., 42) but +- that resulted in a not so random choice for the hmac. This +- implementation now uses a random.seed that is based on the current +- time. + +* Tue Oct 06 2009 Marc Fiuczynski - NodeManager-1.8-14 +- Minor fix such that sliverauth.py makes a more specific call to +- GetSliceTags that include that specific tagname it is looking for. + +* Sat Sep 19 2009 Stephen Soltesz - NodeManager-1.8-13 +- Fix bug that prevented 'OVERRIDES' for working correctly. + +* Tue Sep 08 2009 Faiyaz Ahmed - NodeManager-1.8-12 +- Increase disk limits to 10G per sliver +- Sanity check slice for home directory before starting (hack) +- Check codemux arguments + +* Thu Aug 06 2009 Faiyaz Ahmed - NodeManager-1.8-11 +- * Fix Delegation +- * Move plcapi in plugin-api GetSlivers() calls. +- * Persistent Authcheck and resync session when auth failure + +* Tue Aug 04 2009 Faiyaz Ahmed - NodeManager-1.8-10 +- Disabling sliverauth module. Not ready for deployment. + * Mon Aug 03 2009 Faiyaz Ahmed - NodeManager-1.8-9 - Fixing overrides semantics. @@ -154,3 +291,5 @@ rm -rf $RPM_BUILD_ROOT * Mon Nov 13 2006 Mark Huang - - Initial build. + +%define module_current_branch 1.8