%define name NodeManager
%define version 2.0
-%define taglevel 6
+%define taglevel 8
%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
# 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
rsync -av initscripts/ $RPM_BUILD_ROOT/%{_initrddir}/
chmod 755 $RPM_BUILD_ROOT/%{_initrddir}/*
-install -D -m 644 logrotate/nm $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/nm
+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.dat
+/root/sliver_mgr_db.pickle@/var/lib/nodemanager/nodemanager.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
service fuse-pl restart
fi
-
+##########
%preun
# 0 = erase, 1 = upgrade
if [ $1 -eq 0 ] ; then
%{_datadir}/NodeManager/
%{_bindir}/forward_api_calls
%{_initrddir}/
-%{_sysconfdir}/logrotate.d/nm
+%{_sysconfdir}/logrotate.d/nodemanager
+/var/lib/
%changelog
+* Fri May 14 2010 Talip Baris Metin <Talip-Baris.Metin@sophia.inria.fr> - NodeManager-2.0-8
+- tagging before RC
+
+* Wed May 12 2010 S.Çağlar Onur <caglar@cs.princeton.edu> - 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 <sapanb@cs.princeton.edu> - 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