X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa.spec;h=f5f8e50e55016262a55ca2ca98909d3942f4b633;hb=02b77e6682d91cec7ddb35fb140720e95a026e29;hp=4943fce35db5780ef79e0fea91c3cb2bd70411b4;hpb=388a2ce3a9c8ea110911b29fbb91ca238904362e;p=sfa.git diff --git a/sfa.spec b/sfa.spec index 4943fce3..f5f8e50e 100644 --- a/sfa.spec +++ b/sfa.spec @@ -1,6 +1,6 @@ %define name sfa %define version 2.1 -%define taglevel 11 +%define taglevel 22 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} %global python_sitearch %( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" ) @@ -25,7 +25,6 @@ Summary: the SFA python libraries Group: Applications/System BuildRequires: make -Requires: myplc-config Requires: python >= 2.5 Requires: pyOpenSSL >= 0.7 Requires: m2crypto @@ -78,17 +77,27 @@ Summary: the SFA layer around MyPLC Group: Applications/System Requires: sfa -%package cm -Summary: the SFA layer around MyPLC NodeManager -Group: Applications/System -Requires: sfa -Requires: pyOpenSSL >= 0.6 +#%package cm +#Summary: the SFA layer around MyPLC NodeManager +#Group: Applications/System +#Requires: sfa +#Requires: pyOpenSSL >= 0.6 %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 dummy +Summary: the SFA layer around a Dummy Testbed +Group: Applications/System +Requires: sfa + %package sfatables Summary: sfatables policy tool for SFA Group: Applications/System @@ -118,13 +127,19 @@ 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 cm -This package implements the SFA interface which serves as a layer -between the existing PlanetLab NodeManager interfaces and the SFA API. +#%description cm +#This package implements the SFA interface which serves as a layer +#between the existing PlanetLab NodeManager interfaces and the SFA API. %description federica The SFA driver for FEDERICA. +%description nitos +The SFA driver for NITOS. + +%description dummy +The SFA driver for a Dummy Testbed. + %description sfatables sfatables is a tool for defining access and admission control policies in an SFA network, in much the same way as iptables is for ip @@ -168,6 +183,7 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/sfaadmin %{_bindir}/keyconvert.py* %{_bindir}/sfa-config-tty +%{_bindir}/sfa-config %config /etc/sfa/default_config.xml %config (noreplace) /etc/sfa/aggregates.xml %config (noreplace) /etc/sfa/registries.xml @@ -200,16 +216,22 @@ rm -rf $RPM_BUILD_ROOT /etc/sfa/xml.xsd /etc/sfa/protogeni-rspec-common.xsd /etc/sfa/topology -%{_bindir}/gen-sfa-cm-config.py* +#%{_bindir}/gen-sfa-cm-config.py* -%files cm -/etc/init.d/sfa-cm -%{_bindir}/sfa_component_setup.py* -# cron jobs here +#%files cm +#/etc/init.d/sfa-cm +#%{_bindir}/sfa_component_setup.py* +## cron jobs here %files federica %{python_sitelib}/sfa/federica +%files nitos +%{python_sitelib}/sfa/nitos + +%files dummy +%{python_sitelib}/sfa/dummy + %files sfatables /etc/sfatables/* %{_bindir}/sfatables @@ -234,20 +256,82 @@ 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 || : +#### 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 || : %changelog +* Sun Dec 16 2012 Thierry Parmentelat - sfa-2.1-22 +- suited (and required) to run with plcapi-5.1-5 b/c of changes to AddPerson +- tweaks in nitos importer +- improvements to sfaadmin check-gid + +* Tue Dec 11 2012 Thierry Parmentelat - sfa-2.1-21 +- PL importer: minor fixes for corner cases +- PL importer: also handles last_updated more accurately +- sfi update can be used to select a key among several in PL +- sfi add/update usage message fixes (no more record) +- new feature sfaadmin registry check_gid [-a] + +* Mon Dec 03 2012 Thierry Parmentelat - sfa-2.1-20 +- fix 2 major bugs in PL importer +- esp. wrt GID management against PLC key + +* Wed Nov 28 2012 Thierry Parmentelat - sfa-2.1-19 +- nicer sfi delegate, can handle multiple delegations and for authorities(pi) as well + +* Wed Nov 28 2012 Thierry Parmentelat - sfa-2.1-18 +- support fordelegation in sfaclientlib +- sfi delegate fixed +- other delegation-related sfi option trashed +- new config (based on ini format) +- new dummy driver and related package +- pl importer has more explicit error messages +- credential dump shows expiration + +* Tue Oct 16 2012 Thierry Parmentelat - sfa-2.1-17 +- bugfix in forwarding Resolve requests +- various fixes in the nitos driver wrt keys and users + +* Mon Oct 01 2012 Thierry Parmentelat - sfa-2.1-16 +- various tweaks for the nitos driver + +* Wed Sep 26 2012 Thierry Parmentelat - sfa-2.1-15 +- first stab at a driver for the NITOS/OMF testbed (sep. pkg) +- deeper cleanup of the data-dependencies between SFA and the testbed +- in particular, sfi create issues Resolve(details=False) +- for that purpose, Resolve exposes reg-* keys for SFA builtins +- which in turn allows sfi list to show PIs, slice members and keys +- NOTE: sfa-config-tty is known to be broken w/ less frequently used func's +- Shows stacktrace when startup fails (DB conn, wrong flavour, etc..) + +* Mon Sep 17 2012 Thierry Parmentelat - sfa-2.1-14 +- configurable data-dir (/var/lib/sfa) +- no more dependent on myplc-config +- some support for hrns with _ instead of \. +- fix for PL importing in presence of gpg keys +- DeleteSliver returns True instead of 1 in case of success +- Various improvements on the openstack/nova side +- new package sfa-nitos + +* Wed Jul 11 2012 Thierry Parmentelat - sfa-2.1-13 +- bugfix that prevented to call 'sfi create' - (was broken in sfa-2.1-12) +- sfi to remove expired credentials + +* Tue Jul 10 2012 Tony Mack - sfa-2.1-12 +- Update Openstack driver to support Essex release/ +- Fix authority xrn bug. + + * Thu Jun 07 2012 Thierry Parmentelat - sfa-2.1-11 - review packaging - site-packages/planetlab now come with sfa-plc - new package sfa-federica