X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa.spec;h=7882869eaddbf054f41042aedf77630994b5ae6a;hb=2bfcf67eab80f06cdf539a04865a6a8caaef58e7;hp=71870ed00da440c0b06023501dc5a8ac67040ceb;hpb=54d6cde3ed9f2419a5fe7eefcb2cac2be33a37fe;p=sfa.git diff --git a/sfa.spec b/sfa.spec index 71870ed0..7882869e 100644 --- a/sfa.spec +++ b/sfa.spec @@ -1,6 +1,6 @@ %define name sfa -%define version 3.1 -%define taglevel 22 +%define version 4.0 +%define taglevel 1 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} %global python_sitearch %( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" ) @@ -62,21 +62,6 @@ Summary: the SFA layer around MyPLC Group: Applications/System Requires: sfa -%package flashpolicy -Summary: SFA support for flash clients -Group: Applications/System -Requires: sfa - -%package federica -Summary: the SFA layer around Federica -Group: Applications/System -Requires: sfa - -%package nitos -Summary: the SFA layer around NITOS -Group: Applications/System -Requires: sfa - %package iotlab Summary: the SFA layer around IotLab Group: Applications/System @@ -113,15 +98,6 @@ sfi.py, together with other utilities. This package implements the SFA interface which serves as a layer between the existing PlanetLab interfaces and the SFA API. -%description flashpolicy -This package provides support for adobe flash client applications. - -%description federica -The SFA driver for FEDERICA. - -%description nitos -The SFA driver for NITOS. - %description iotlab The SFA driver for IotLab. @@ -150,15 +126,14 @@ make VERSIONTAG="%{version}-%{taglevel}" SCMURL="%{SCMURL}" install DESTDIR="$RP rm -rf $RPM_BUILD_ROOT %files -/etc/init.d/sfa -/usr/lib/systemd/system/*.service +/lib/systemd/system/*.service %{_bindir}/sfa-start.py* %{_bindir}/sfaadmin.py* %{_bindir}/sfaadmin %{_bindir}/keyconvert.py* %{_bindir}/sfa-config-tty %{_bindir}/sfa-config -%{_bindir}/sfa-db-init.sh +%{_bindir}/sfa-setup.sh %config /etc/sfa/default_config.xml %config (noreplace) /etc/sfa/aggregates.xml %config (noreplace) /etc/sfa/registries.xml @@ -194,7 +169,6 @@ rm -rf $RPM_BUILD_ROOT %files plc %defattr(-,root,root) %{python_sitelib}/sfa/planetlab -%{python_sitelib}/sfa/openstack /etc/sfa/pl.rng /etc/sfa/credential.xsd /etc/sfa/top.xsd @@ -203,16 +177,6 @@ rm -rf $RPM_BUILD_ROOT /etc/sfa/protogeni-rspec-common.xsd /etc/sfa/topology -%files flashpolicy -%{_bindir}/sfa_flashpolicy.py* -/etc/sfa/sfa_flashpolicy_config.xml - -%files federica -%{python_sitelib}/sfa/federica - -%files nitos -%{python_sitelib}/sfa/nitos - %files iotlab %{python_sitelib}/sfa/iotlab @@ -227,33 +191,42 @@ rm -rf $RPM_BUILD_ROOT %files tests %{_datadir}/sfa/tests -### sfa installs the 'sfa' service +# arbitrary choice here, subject to manual tweaks if needed +# this is in line with default_config.xml +# no need to enable sfa-db, will be activated as a dependency %post -chkconfig --add sfa +systemctl enable sfa-aggregate +systemctl enable sfa-registry %preun if [ "$1" = 0 ] ; then - /sbin/service sfa stop || : - /sbin/chkconfig --del sfa || : + for service in sfa-aggregate sfa-registry sfa-db; do + systemctl is-enabled $service && systemctl disable $service + systemctl is-active $service && systemctl stop $service + done fi %postun -[ "$1" -ge "1" ] && { service sfa dbdump ; service sfa restart ; } - -#### sfa-cm installs the 'sfa-cm' service -#%post cm -#chkconfig --add sfa-cm -# -#%preun cm -#if [ "$1" = 0 ] ; then -# /sbin/service sfa-cm stop || : -# /sbin/chkconfig --del sfa-cm || : -#fi -# -#%postun cm -#[ "$1" -ge "1" ] && service sfa-cm restart || : +if [ "$1" -ge "1" ] ; then + for service in sfa-db sfa-registry sfa-aggregate; do + systemctl is-active $service && systemctl restart $service + done +fi %changelog +* Wed May 30 2018 Thierry - sfa-4.0-1 +- systemd service files install in /lib instead of /usr/lib for ubuntus +- removed all features relating to slice manager +- removed all features relating to component manager + +* Mon May 28 2018 Thierry - sfa-4.0-0 +- expose geni_api_versions as https:// +- avoid publishing non-relevant entries in GetVersion +- fixes in the IoT-lab driver (thanks Loic) +- reviewed logging policy, less awkward and more reliable; /var/log/sfa{,-import}.log should now be alive and time rotate +- rewrote init-style startup script into systemd-native services: sfa-aggregate and sfa-registry, that both depend on sfa-db +- huge cleanup, removed everything related to init.d; debian; flash-policy; max aggregate; federica, openstack/nova and nitos drivers + * Fri Mar 16 2018 Thierry - sfa-3.1-22 - pl: tweaks for exposing country / city on nodes from site tags if set - pl: tweaks for exposing hardware_types on nodes from node tag 'hardware_type' if set @@ -829,7 +802,7 @@ fi * Fri Jun 10 2011 Thierry Parmentelat - sfa-1.0-23 - includes a change on passphrases that was intended in 1.0-22 -* Thu Jun 6 2011 Tony Mack - sfa-1.0-22 +* Mon Jun 6 2011 Tony Mack - sfa-1.0-22 - Added support for ProtoGENI RSpec v2 * Wed Mar 16 2011 Thierry Parmentelat - sfa-1.0-21 @@ -957,7 +930,7 @@ fi the api handler on every new server request, making it easier to access the cache and use in more general ways. -* Thu May 11 2010 Tony Mack - sfa-0.9-11 +* Tue May 11 2010 Tony Mack - sfa-0.9-11 - SfaServer now uses a pool of threads to handle requests concurrently - sfa.util.rspec no longer used to process/manage rspecs (deprecated). This is now handled by sfa.plc.network and is not backwards compatible - PIs can now get a slice credential for any slice at their site without having to be a member of the slice @@ -1076,7 +1049,7 @@ fi * Sat May 30 2009 Thierry Parmentelat - geniwrapper-0.2-2 - bugfixes - still a work in progress -* Fri May 18 2009 Baris Metin +* Mon May 18 2009 Baris Metin - initial package