X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=NodeManager.spec;h=415bf8427b5c70c5b32d58ec089bbfee283969c0;hb=refs%2Fheads%2F1.7;hp=5597b96d0b7577f9ab6f6040df161dbf599b2521;hpb=a943193a5424dee0d84166a7255363d77c4d9ec9;p=nodemanager.git diff --git a/NodeManager.spec b/NodeManager.spec index 5597b96..415bf84 100644 --- a/NodeManager.spec +++ b/NodeManager.spec @@ -1,19 +1,38 @@ +# +# $Id$ +# +%define url $URL$ + +%define slicefamily %{pldistro}-%{distroname}-%{_arch} + +%define name NodeManager +%define version 1.7 +%define taglevel 47 + +%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} + Summary: PlanetLab Node Manager -Name: NodeManager -Version: 1.3 -Release: 5%{?pldistro:.%{pldistro}}%{?date:.%{date}} +Name: %{name} +Version: %{version} +Release: %{release} License: PlanetLab Group: System Environment/Daemons -URL: http://cvs.planet-lab.org/cvs/NodeManager Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +Vendor: PlanetLab +Packager: PlanetLab Central +Distribution: PlanetLab %{plrelease} +URL: %(echo %{url} | cut -d ' ' -f 2) + +BuildArch: noarch + # Old Node Manager Obsoletes: sidewinder, sidewinder-common # vuseradd, vuserdel -Requires: vserver-reference -Requires: util-vserver +Requires: vserver-%{slicefamily} +Requires: util-vserver >= 0.30.208-17 # vserver.py Requires: util-vserver-python @@ -27,6 +46,9 @@ Requires: curl # Uses function decorators Requires: python >= 2.4 +# sioc/plnet +Requires: pyplnet = 4.2 + %description The PlanetLab Node Manager manages all aspects of PlanetLab node and slice management once the node has been initialized and configured by @@ -45,6 +67,7 @@ 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 @@ -53,12 +76,19 @@ chkconfig --add conf_files chkconfig conf_files on chkconfig --add nm chkconfig nm on -service nm restart +chkconfig --add fuse-pl +chkconfig fuse-pl on +if [ "$PL_BOOTCD" != "1" ] ; then + service nm restart + service fuse-pl restart +fi %preun # 0 = erase, 1 = upgrade if [ $1 -eq 0 ] ; then + chkconfig fuse-pl off + chkconfig --del fuse-pl chkconfig nm off chkconfig --del nm chkconfig conf_files off @@ -70,14 +100,190 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc -%dir %{_datadir}/NodeManager -%{_datadir}/NodeManager/* +%{_datadir}/NodeManager/ %{_bindir}/forward_api_calls %{_initrddir}/nm %{_initrddir}/conf_files +%{_initrddir}/fuse-pl %{_sysconfdir}/logrotate.d/nm %changelog +* Tue Mar 10 2009 Faiyaz Ahmed - NodeManager-1.7-47 +- * Removed thread in conf_files. The thread with die but the module's callback would happily return without any errors. + +* Tue Mar 10 2009 Faiyaz Ahmed - NodeManager-1.7-46 +- Log calls to vuseradd. If vuseradd fails, the exception will be reported in /valog/nm. + +* Mon Mar 02 2009 Faiyaz Ahmed - NodeManager-1.7-45 +- Allowing controller accounts to use unique GIDs can overwrite the default "slice" group. Controllers now use the "slice" GID instead of unique GIDs. + +* Thu Feb 26 2009 Faiyaz Ahmed - NodeManager-1.7-44 +- Delegation code optimization +- Fixed some comments + +* Mon Feb 02 2009 Faiyaz Ahmed - NodeManager-1.7-43 +- BUGFIX: Extra logging was causing the main thread to die when the API was unavailable (which happens nightly due to db cleanup job). Fixed. + +* Fri Jan 30 2009 Faiyaz Ahmed - NodeManager-1.7-42 +- * Can add or remove BW limits from PLC w/o reboots. + +* Fri Jan 30 2009 Faiyaz Ahmed - NodeManager-1.7-41 +- Syntax fix. + +* Fri Jan 30 2009 Faiyaz Ahmed - NodeManager-1.7-40 +- * Ensure RSPEC update on all account types per epoch. +- * BUGFIX: HTBs were never being created when default slice's overrides weren'tset. + +* Thu Jan 29 2009 Faiyaz Ahmed - NodeManager-1.7-39 +- Supports disabling of HTBs from PLC. + +* Wed Dec 03 2008 Daniel Hokka Zakrisson - NodeManager-1.7-38 +- Add support for plugins. +- Move network code to a separate module. +- Add AdminTicket API. +- Add support for sysctl slice attributes. + +* Tue Sep 23 2008 Faiyaz Ahmed - NodeManager-1.7-37 +- Slices are created 1 at a time to avoid race conditions. + +* Fri Sep 19 2008 Faiyaz Ahmed - NodeManager-1.7-36 +- Internet2 clique flow classification is now setup by NM. + +* Wed Sep 17 2008 Faiyaz Ahmed - NodeManager-1.7-35 +- Clique network shares don't exist. Removed from bwmon. + +* Fri Sep 12 2008 Faiyaz Ahmed - NodeManager-1.7-34 +- * Fixed slice restart via xmlrpc to actually set resources +- * Reverted bwmon to check current min/max limits before manipulating HTB. + +* Wed Sep 03 2008 Faiyaz Ahmed - NodeManager-1.7-33 +- bwmon now has enable/disable flag to control throttling. + +* Mon Sep 01 2008 Thierry Parmentelat - NodeManager-1.7-32 +- always log message when expected vserver reference is missing + +* Mon Aug 25 2008 Faiyaz Ahmed - NodeManager-1.7-31 +- Emails were only being sent of high bandwidth caps were being exceeded. Fixed. + +* Thu Aug 21 2008 Faiyaz Ahmed - NodeManager-1.7-30 +- bwmon: Only mention the limit the slice went over. Not both it and the second limit. + +* Wed Aug 20 2008 Faiyaz Ahmed - NodeManager-1.7-29 +- Fixed KeyError in logging. + +* Wed Aug 20 2008 Faiyaz Ahmed - NodeManager-1.7-28 +- Fixed syntax error in notify function call. Also fixed values in email message and logging. + +* Mon Aug 18 2008 Daniel Hokka Zakrisson - NodeManager-1.7-27 +- Fix the FUSE initscript. + +* Sun Aug 17 2008 Daniel Hokka Zakrisson - NodeManager-1.7-26 +- FUSE support. + +* Wed Aug 13 2008 Faiyaz Ahmed - NodeManager-1.7-25 +- Removed thread created for each sliver (!!!). +- Slivers now spawned out of main thread. +- This closes the Delegation bug and closes the recent rash of NM instabilities due to queue overflows. [ticket: 384] + +* Fri Aug 01 2008 Faiyaz Ahmed - NodeManager-1.7-24 +- * Update bandwidth related attributes on every NM sync. Bwlimit will check if values have changed. +- * Vsys supports local_ scripts and NM will disregard them. + +* Mon Jul 28 2008 Faiyaz Ahmed - NodeManager-1.7-23 +- After removing the fork() to the slice's uid when writing .ssh/authorized_keys, .ssh had the wrong owner/group. Fixed. + +* Fri Jul 25 2008 Faiyaz Ahmed - NodeManager-1.7-22 +- Small change. Change uid to slice owner of authorized_keys. + +* Wed Jul 23 2008 Faiyaz Ahmed - NodeManager-1.7-21 +- Slices with initscripts kept restarting. Fixed. +- Also removed unnecessary fork just to write .ssh/authorized keys for every slice. + +* Tue Jul 15 2008 Faiyaz Ahmed - NodeManager-1.7-20 +- * Check slice is_running() every cycle. If not, assume damaged and restart. + +* Mon Jul 07 2008 Daniel Hokka Zakrisson - NodeManager-1.7-19 +- chrooting is not thread-safe. + +* Fri Jun 27 2008 Faiyaz Ahmed - NodeManager-1.7-18 +- Log disk init AFTER acquiring disk semaphore. + +* Wed Jun 25 2008 Thierry Parmentelat - NodeManager-1.7-17 +- unconditionnally passes node_id and slicefamily to conf_file scripts +- correctly set personality a sliver creation time (not yet used by util-vserver-pl though) + +* Thu Jun 19 2008 Stephen Soltesz - NodeManager-1.7-16 +- +- enables a vsys slice attribute to end with 'a', 'c', or 'l' characters without +- NM going bonkers. +- + +* Wed Jun 18 2008 Stephen Soltesz - NodeManager-1.7-15 +- +- enable restart if vsys.conf changes also. +- + +* Wed Jun 18 2008 Stephen Soltesz - NodeManager-1.7-14 +- +- the _restart flag for vsys was getting lost when looking across multiple +- vservers. adding the 'or' should preserve any 'True' returns from +- createVsysDir() +- + +* Tue Jun 17 2008 Faiyaz Ahmed - NodeManager-1.7-13 +- +- Time out curl when no response for 90 seconds. +- + +* Fri Jun 13 2008 Stephen Soltesz - NodeManager-1.7-12 +- Patch designed to work around the vsys-fail-to-restart problem with +- non-existent directories, and the vuseradd-fail-to-work on directories that +- do exist. +- +- This patch will work in conjunction with the new vsys patch. +- + +* Wed May 14 2008 Thierry Parmentelat - NodeManager-1.7-10 +- fixed doc build by locating locally installed DTDs at build-time + +* Fri May 09 2008 Faiyaz Ahmed - NodeManager-1.7-9 +- * Reverted vserver start to forking before VServer.start to avoid defunct procs.* House keeping in various places. + +* Fri May 09 2008 Thierry Parmentelat - NodeManager-1.7-8 +- merge changes for myplc-docs from trunk + +* Wed Apr 16 2008 Faiyaz Ahmed - NodeManager-1.7-7 +- +- Set vcVHI_CONTEXT as slice_id for fprobe-ulog to mark packets with. +- + +* Wed Apr 09 2008 Faiyaz Ahmed - NodeManager-1.7-5 NodeManager-1.7-6 +- +- * Codemux will use PLC_API_HOST when PLC_PLANETFLOW_HOST isn't defined. +- + +* Fri Apr 04 2008 Faiyaz Ahmed - NodeManager-1.7-4 NodeManager-1.7-5 +- * vdu limitting when NM restarts and slices are re-init'ed +- * CoDemux config parser update. Now tolerates spaces. + +* Wed Apr 02 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 +- BW totals preserved for dynamic slices +- Closes bug where node cap sets off bw slice alarms for all slices. + +* Wed Oct 03 2007 Faiyaz Ahmed . +- Switched to SVN. + * Mon Nov 13 2006 Mark Huang - - Initial build.