X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=nodemanager-lib.spec;h=2db3276ee2551cdd2fe30ed54f3d79f5d03f36ec;hb=refs%2Fheads%2Fsystemd;hp=6448fbbee269db7d51f86066144a0df40330ac85;hpb=89dfb68021ff0df3b8237f41981180360331125f;p=nodemanager.git diff --git a/nodemanager-lib.spec b/nodemanager-lib.spec index 6448fbb..2db3276 100644 --- a/nodemanager-lib.spec +++ b/nodemanager-lib.spec @@ -2,10 +2,18 @@ %define name nodemanager-lib %define version 5.2 -%define taglevel 4 +%define taglevel 9 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} -%global python_sitearch %( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" ) + +########## use initscripts or systemd unit files to start installed services +%if "%{distro}" == "Fedora" && %{distrorelease} >= 18 +%define make_options WITH_SYSTEMD=true +%define initdir /usr/lib/systemd/system +%else +%define make_options WITH_INIT=true +%define initdir %{_initrddir} +%endif Summary: PlanetLab Node Manager Library Name: %{name} @@ -24,8 +32,13 @@ URL: %{SCMURL} # not possible because of forward_api_calls #BuildArch: noarch +# make sure we can invoke systemctl in post install script +%if "%{initdir}" != "%{_initrddir}" +Requires: systemd +%endif + # Uses function decorators -Requires: python >= 2.4 +Requires: python >= 2.7 # connecting PLC Requires: python-pycurl # Signed tickets @@ -46,56 +59,24 @@ local operations on slices. nodemanager-lib only provides a skeleton and needs as a companion either nodemanager-vs or nodemanager-lxc +############################## %prep %setup -q %build # make manages the C and Python stuff -%{__make} %{?_smp_mflags} lib +%{__make} %{?_smp_mflags} %{make_options} lib %install # 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/ -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 +%{__make} %{?_smp_mflags} %{make_options} install-lib DESTDIR="$RPM_BUILD_ROOT" -install -D -m 644 logrotate/nodemanager $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/nodemanager -install -D -m 755 sshsh $RPM_BUILD_ROOT/bin/sshsh - -########## +############################## %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 -# +########## traditional init +%if "%{initdir}" == "%{_initrddir}" +########## chkconfig --add conf_files chkconfig conf_files on chkconfig --add nm @@ -103,13 +84,29 @@ chkconfig nm on chkconfig --add fuse-pl chkconfig fuse-pl on if [ "$PL_BOOTCD" != "1" ] ; then - service nm restart - service fuse-pl restart + service nm restart + service fuse-pl restart fi - ########## +%else +########## systemd +systemctl enable nm.service +systemctl enable conf_files.service +# empty +#systemctl enable fuse-pl.service +if [ "$PL_BOOTCD" != "1" ] ; then + systemctl restart nm.service +# systemctl restart fuse-pl.service +fi +########## +%endif + +############################## %preun # 0 = erase, 1 = upgrade +########## traditional init +%if "%{initdir}" == "%{_initrddir}" +########## if [ $1 -eq 0 ] ; then chkconfig fuse-pl off chkconfig --del fuse-pl @@ -118,7 +115,18 @@ if [ $1 -eq 0 ] ; then chkconfig conf_files off chkconfig --del conf_files fi +########## +%else +########## systemd +if [ $1 -eq 0 ] ; then +# systemctl disable fuse-pl.service + systemctl disable conf_files.service + systemctl disable nm.service +fi +########## +%endif +############################## %clean rm -rf $RPM_BUILD_ROOT @@ -126,12 +134,37 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %{_datadir}/NodeManager/ %{_bindir}/forward_api_calls -%{_initrddir}/ +%{initdir}/ %{_sysconfdir}/logrotate.d/nodemanager -/var/lib/ +/var/lib/nodemanager/ /bin/sshsh %changelog +* Wed Dec 11 2013 Thierry Parmentelat - nodemanager-5.2-9 +- fixes in hostmap, and in interfaces +- new vsys_sysctl +- privatebridge now comes with nodemanager-lib + +* Fri Sep 20 2013 Thierry Parmentelat - nodemanager-5.2-8 +- omf plugin does not block any longer when running trigger script +- log goes into sliver's /var/log instead + +* Wed Aug 28 2013 Thierry Parmentelat - nodemanager-5.2-7 +- new install-scripts target in Makefile +- conf_files and fuse-pl initscripts chmod'ed +x +- omf_resctl config template tweaked to use _slicename_%_hostname_ + +* Sun Jul 14 2013 Thierry Parmentelat - nodemanager-5.2-6 +- make sure to create /etc/planetlab/virt so others can read that +- expose get_node_virt() and command_in_slice() +- refined omf_resctl plugin (fetches trigger, and calls it on expire change) +- user's .profile now has right owner +- other tweaks in lxc slivers + +* Wed Jul 03 2013 Thierry Parmentelat - nodemanager-5.2-5 +- lxc slice creation: slice user was created with unknown gid - fixed +- lxc slice creation: .profile for root and user - fixed + * Sat Jun 29 2013 Thierry Parmentelat - nodemanager-5.2-4 - fix umounting of ssh directory when deleting omf-friendly slivers - support for writing cgroups in subsystems other than cpuset