X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLCAPI.spec;h=98236bbeaf50574bf1e8cffb0b89222d8bfb7824;hb=refs%2Fheads%2Fextensible;hp=b23bd376b93a28f1922e3e2008c63b0a6545db35;hpb=cbe8784ae714856884267afa3b4cf8aed8cf7ed4;p=plcapi.git diff --git a/PLCAPI.spec b/PLCAPI.spec index b23bd37..98236bb 100644 --- a/PLCAPI.spec +++ b/PLCAPI.spec @@ -6,7 +6,7 @@ %define name PLCAPI %define version 5.0 -%define taglevel 2 +%define taglevel 18 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} @@ -34,21 +34,28 @@ Requires: python-psycopg2 Requires: python-pycurl Requires: httpd Requires: mod_python +# mod_wsgi will replace mod_python when we are ready +Requires: mod_wsgi Requires: mod_ssl Requires: SOAPpy +Requires: python-simplejson # for the RebootNodeWithPCU method -Requires: pcucontrol +Requires: pcucontrol >= 1.0-6 # for OMF integration -Requires: pyaspects +Requires: pyaspects >= 0.4 Requires: python-twisted-words Requires: python-twisted-web +# ldap +Requires: python-ldap ### avoid having yum complain about updates, as stuff is moving around # plc.d/api Conflicts: MyPLC <= 4.3 # We use psycopg2 -BuildRequires: postgresql-devel +# +# but we don't need to rebuild it as we depend on distro's packages - baris +# BuildRequires: postgresql-devel # Standard xmlrpc.so that ships with PHP does not marshal NULL BuildRequires: php-devel @@ -109,8 +116,10 @@ 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 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 %clean rm -rf $RPM_BUILD_ROOT @@ -120,6 +129,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %dir %{_datadir}/plc_api +%dir /var/log/omf/ %{_datadir}/plc_api/* %{_bindir}/plcsh %{php_extension_dir}/xmlrpc.so @@ -128,9 +138,75 @@ 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/omf_slicemgr.py* +/usr/bin/reset_xmpp_pubsub_nodes.py* + %changelog +* Thu Sep 16 2010 Thierry Parmentelat - plcapi-5.0-18 +- fix RefreshPeer that was not working in 5.0-17 + +* Thu Sep 16 2010 Thierry Parmentelat - plcapi-5.0-17 +- RefreshPeer is able to cope with 2 peers running different releases of the api +- DeletePerson can be used on duplicates +- first appearance of ModPythonJson.py + +* Wed Sep 01 2010 Thierry Parmentelat - plcapi-5.0-16 +- set accessors return the new value +- tweaks in the pubsub groups management + +* Wed Jul 28 2010 S.Çağlar Onur - plcapi-5.0-15 +- convert hostnames to lower case and use ILIKE instead of LIKE + +* Fri Jul 16 2010 Baris Metin - plcapi-5.0-14 +- 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 + +* Mon Jun 28 2010 Baris Metin - PLCAPI-5.0-12 +- automatically set vsys tag for omf controlled slices + +* Sat Jun 26 2010 Thierry Parmentelat - PLCAPI-5.0-11 +- addition of the 'ssh_key' slice tag +- first draft of the LDAP interface + +* Tue Jun 22 2010 Thierry Parmentelat - PLCAPI-5.0-10 +- reservation granularity defined in plc-config-tty (requires myplc 5.0.5) +- and readable through GetLeaseGranularity +- GetSlivers to expose reservation_policy and lease_granularity +- GetBootMedium fixed for reservable nodes +- tweaks in pcucontrol (requires pcucontrol-1.0-6) +- new Apache mod_wsgi python interface + +* Fri May 14 2010 Thierry Parmentelat - PLCAPI-5.0-9 +- the leases system + +* Wed Apr 14 2010 Thierry Parmentelat - PLCAPI-5.0-8 +- previous tag had gone wrong + +* Wed Apr 14 2010 Talip Baris Metin - PLCAPI-5.0-6 +- fix pubsub hostname + +* Fri Apr 02 2010 Thierry Parmentelat - PLCAPI-5.0-5 +- tweaks for the omf support (xmpp groups and RC-controlled slices) +- BootNodeUpdate supports also ssh_rsa_key (and logs only changes) +- GetNodeFlavour exposes fcdistro + +* Sun Mar 14 2010 Thierry Parmentelat - PLCAPI-5.0-4 +- do not use UpdateNode for handling the 'hrn' tag - should fix refresh peer & foreign nodes more generally + +* Fri Mar 12 2010 Thierry Parmentelat - PLCAPI-5.0-3 +- slice tag 'omf_control' supported for getting OMF's resource controller shipped to slivers +- pyaspect hooks allow to maintain the namespace xmpp groups +- new omf_slicemgr is a proxy to xmpp, used by these hooks +- nodes have their hrn exposed in the 'hrn' tag +- node hrn exposed in GetSlivers, as well as the overall xmpp config +- system slice 'drl' gets created by db-config +- daniel's changes to Filter for supporting wildcards in lists +- AddSliceTag consistency check tweaked + * Thu Feb 11 2010 Thierry Parmentelat - PLCAPI-5.0-2 - major cleanup - get rid of all 4.2-related legacy code