X-Git-Url: http://git.onelab.eu/?p=plcapi.git;a=blobdiff_plain;f=plcapi.spec;h=0cae1a45734fd1d156a2223fb95211286860bda8;hp=d836d8d2b08786f5dc0db6ca672957734eae6dc8;hb=9aecb8c6fde06136bef94e2fd6fce832dc3c0c10;hpb=43623bf7a2a825705c6564cb7ea4ea80387fd351 diff --git a/plcapi.spec b/plcapi.spec index d836d8d..0cae1a4 100644 --- a/plcapi.spec +++ b/plcapi.spec @@ -1,6 +1,6 @@ %define name plcapi -%define version 5.2 -%define taglevel 2 +%define version 5.3 +%define taglevel 10 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} @@ -21,17 +21,24 @@ URL: %{SCMURL} Provides: PLCAPI Obsoletes: PLCAPI -# We use set everywhere -Requires: python >= 2.4 +# requirement to mod_python or mod_wsgi: deferred to myplc +Requires: httpd mod_ssl +Requires: Django Requires: postgresql >= 8.2, postgresql-server >= 8.2 +# We use set everywhere +Requires: python >= 2.7 Requires: postgresql-python Requires: python-psycopg2 Requires: python-pycurl -Requires: httpd -# requirement to mod_python or mod_wsgi: deferred to myplc -Requires: mod_ssl +# used in GPG.py as a replacement to PyXML's Canonicalize +Requires: python-lxml +# Fedora had support for SOAPpy up to fedora20 +# https://lists.fedoraproject.org/pipermail/devel/2014-June/199730.html +# https://lists.fedoraproject.org/pipermail/devel/2014-June/200379.html +%if ("%{distro}" == "Fedora" && %{distrorelease} <= 20) || ("%{distro}" != "Fedora") Requires: SOAPpy -Requires: python-simplejson +%endif +#Requires: python-simplejson # for the RebootNodeWithPCU method Requires: pcucontrol >= 1.0-6 # for OMF integration @@ -41,9 +48,7 @@ Requires: python-twisted-web # ldap Requires: python-ldap # for memcache -Requires: python-memcached -Requires: memcached -Requires: Django +Requires: memcached python-memcached ### avoid having yum complain about updates, as stuff is moving around # plc.d/api Conflicts: MyPLC <= 4.3 @@ -54,7 +59,10 @@ Conflicts: MyPLC <= 4.3 # BuildRequires: postgresql-devel # Standard xmlrpc.so that ships with PHP does not marshal NULL -BuildRequires: php-devel PyXML python-simplejson +# for building the wsdl interface we used to require PyXML +# but this has gone with f20 so turning this off for now +BuildRequires: php-devel +#BuildRequires: python-simplejson Obsoletes: php-xmlrpc Provides: php-xmlrpc @@ -112,12 +120,14 @@ chmod 444 ${RPM_BUILD_ROOT}/etc/planetlab/db-config.d/* echo "* Installing wsdl" install -D -m 644 wsdl/plcapi.wsdl $RPM_BUILD_ROOT/var/www/html/wsdl/plcapi.wsdl -# Install omf_slicemgr.py -install -D -m 755 omf/omf_slicemgr.py $RPM_BUILD_ROOT/usr/bin/omf_slicemgr.py -install -D -m 755 omf/reset_xmpp_pubsub_nodes.py $RPM_BUILD_ROOT/usr/bin/reset_xmpp_pubsub_nodes.py -mkdir -p $RPM_BUILD_ROOT/var/log/omf +## Thierry - June 2013 - omfv6 does not require xmpp pubsub nodes management any more +## Install omf_slicemgr.py +#install -D -m 755 omf/omf_slicemgr.py $RPM_BUILD_ROOT/usr/bin/omf_slicemgr.py +#install -D -m 755 omf/reset_xmpp_pubsub_nodes.py $RPM_BUILD_ROOT/usr/bin/reset_xmpp_pubsub_nodes.py +#mkdir -p $RPM_BUILD_ROOT/var/log/omf # Install ratelimit log +mkdir -p $RPM_BUILD_ROOT/var/log touch $RPM_BUILD_ROOT/var/log/plc_api_ratelimit.log chown apache:apache $RPM_BUILD_ROOT/var/log/plc_api_ratelimit.log @@ -129,7 +139,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %dir %{_datadir}/plc_api -%dir /var/log/omf/ +#%dir /var/log/omf/ %{_datadir}/plc_api/* %{_bindir}/plcsh %{php_extension_dir}/xmlrpc.so @@ -138,12 +148,77 @@ rm -rf $RPM_BUILD_ROOT /etc/plc.d /etc/planetlab/db-config.d /var/www/html/wsdl/plcapi.wsdl -/usr/bin/omf_slicemgr.py* -/usr/bin/reset_xmpp_pubsub_nodes.py* +#/usr/bin/omf_slicemgr.py* +#/usr/bin/reset_xmpp_pubsub_nodes.py* /var/log/plc_api_ratelimit.log %changelog +* Sun Jul 10 2016 Thierry Parmentelat - plcapi-5.3-10 +- GetBootMedium with systemd-debug option : add kernel arg systemd.log_target=console + +* Fri Jun 26 2015 Thierry Parmentelat - plcapi-5.3-9 +- new bootstate 'upgrade' is like reinstall but leaves slices intact + +* Fri Apr 24 2015 Thierry Parmentelat - plcapi-5.3-8 +- GetBootMedium now keeps logs of created bootCD's in /var/tmp/bootmedium + +* Fri Apr 03 2015 Thierry Parmentelat - plcapi-5.3-7 +- reviewed logging strategy, no more direct print but use log instead + +* Wed Feb 18 2015 Thierry Parmentelat - plcapi-5.3-6 +- extensions for the ipv6 feature +- DeleteSliceTag can be run with the 'node' auth +- xmlrpc-epi-php.c has has a tweak for f21/php-5.6 +- also SOAPpy is not present in f21 anymore, so drop that dep. with f>=21 + +* Tue Aug 19 2014 Thierry Parmentelat - plcapi-5.3-5 +- allow GetSlices to filter on tags as well + +* Tue Aug 19 2014 Thierry Parmentelat - plcapi-5.3-4 +- enable filtering on tags (like hrn) with GetPersons and GetSites + +* Mon Jun 02 2014 Thierry Parmentelat - plcapi-5.3-3 +- provide more context in messages from AddPersonToSlice and DeletePersonFromSlice + +* Fri Mar 21 2014 Thierry Parmentelat - plcapi-5.3-2 +- don't use PyXML that is deprecated in f20, use lxml instead +- higher max size for login_base (32 vs 20) and slice name (64 vs 32) + +* Tue Dec 10 2013 Thierry Parmentelat - plcapi-5.3-1 +- create accessor 'hrn' for site as well +- create accessors 'sfa_created' for site/slice/person +- AddSite() and AddSlice() set respectively Site HRN and Slice HRN. +- UpdatePerson() updates Person HRN according to updated email. +- UpdateSite() updates Site HRN according to updated login_base. +- Fix AddPersonToSite(). +- GetPeerData() ignores Sites/Slices/Persons that have tag sfa_created=='True' +- RefreshPeer() manages Site*Person and Person*Role relationships. + +* Thu Oct 10 2013 Thierry Parmentelat - plcapi-5.2-10 +- provide a slicename_to_hrn function + +* Fri Sep 20 2013 Thierry Parmentelat - plcapi-5.2-9 +- add an hrn accessor for slice so the SFA code can keep track of the federation-wide name of the slice + +* Wed Aug 28 2013 Thierry Parmentelat - plcapi-5.2-8 +- fix for wsgi-based deployments, each thread has its own api() + +* Fri Jun 28 2013 Thierry Parmentelat - plcapi-5.2-7 +- also cleanup omf-slicemgr initscript + +* Fri Jun 28 2013 Thierry Parmentelat - plcapi-5.2-6 +- tear down omf-related aspects as this is no longer needed with omfv6 + +* Thu Jun 27 2013 Thierry Parmentelat - plcapi-5.2-5 +- also expose 'expires' in ResolveSlices + +* Wed Jun 26 2013 Thierry Parmentelat - plcapi-5.2-4 +- drop GetSliceSshKeys, new RetrieveSlicePersonKeys and RetrieveSliceSliverKeys + +* Wed May 29 2013 Thierry Parmentelat - plcapi-5.2-3 +- enable netconfig aspects if PLC_NETCONFIG_ENABLED + * Wed Apr 24 2013 Thierry Parmentelat - plcapi-5.2-2 - use SFA code for computing hrn's when available @@ -304,8 +379,8 @@ rm -rf $RPM_BUILD_ROOT - use hrn in pubsub groups * Tue Jul 13 2010 Baris Metin - plcapi-5.0-13 -- - Add timestamps to Nodes, PCUs and Interfaces to make concrete statements about a node's configuration state. -- - OMF fixes +- Add timestamps to Nodes, PCUs and Interfaces to make concrete statements about a node's configuration state. +- OMF fixes * Mon Jun 28 2010 Baris Metin - PLCAPI-5.0-12 - automatically set vsys tag for omf controlled slices