...
 
Commits (1370)

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

*pyc
*swp
*.example
/.installed.cfg
/bin/
/build/
......
This diff is collapsed.
This diff is collapsed.
include CHANGES.txt
include CHANGES.rst
include slapos/proxy/schema.sql
include slapos/slapos-client.cfg.example
include slapos/slapos-proxy.cfg.example
include slapos/slapos.cfg.example
recursive-include slapos *.in *.txt *.xsd
recursive-include slapos *.in *.txt *.xsd *.rst
slapos.core
===========
The core of SlapOS.
Contains the SLAP library, and the slapos command line tools.
For more information, see https://slapos.nexedi.com/ .
slapos.core
===========
The core of SlapOS.
Contains the SLAP library, and the slapgrid, slapformat, slapproxy tools.
For more information, see http://www.slapos.org.
......@@ -12,7 +12,6 @@ Contents:
:maxdepth: 2
slapos.usage.rst
rest.rst
slap.rst
tioformat.rst
......
This diff is collapsed.
......@@ -85,7 +85,11 @@ Examples
* Request a kvm instance specifying the full URL, with default settings::
$ slapos request mykvm \
http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.156:/software/kvm/software.cfg
https://lab.node.vifib.com/nexedi/slapos/raw/1.0.56/software/kvm/software.cfg
* Request a kvm instance specifying an alias from SlapOS Master, with default settings::
$ slapos request mykvm product.kvm
..
XXX update me
......@@ -135,11 +139,16 @@ Nodes will then be ready to accept instances of specified software.
Examples
* Ask installation of wordpress Software Release on COMP-12345::
* Ask installation of kvm Software Release on COMP-12345::
$ slapos supply kvm COMP-12345
* Ask installation of kvm Software Relase on COMP-12345, using alias from SlapOS Master::
$ slapos supply product.kvm COMP-12345
$ slapos supply wordpress COMP-12345
In this example, ``wordpress`` is an alias for the full URL, and is defined in :file:`slapos-client.cfg`.
In this example, ``kvm`` is an alias for the full URL, and is defined in :file:`slapos-client.cfg`.
remove
~~~~~~
......@@ -153,11 +162,11 @@ Ask removal of a software from a specific node or group of nodes. Existing insta
Examples
* Ask installation of wordpress Software Release on COMP-12345::
* Ask installation of kvm Software Release on COMP-12345::
$ slapos supply wordpress COMP-12345
$ slapos supply kvm COMP-12345
In this example, ``wordpress`` is an alias for the full URL, and is defined in :file:`slapos-client.cfg`.
In this example, ``kvm`` is an alias for the full URL, and is defined in :file:`slapos-client.cfg`.
..
autosupply
......@@ -218,14 +227,9 @@ This will register the current node, and generate the SlapOS configuration file.
The command requires an authentication token, either provided as an argument,
or given at the interactive prompt.
Go to the SlapOS Master web page, click ``My Space``, then ``My Account``, then
``Generate a computer security token``.
Go to the SlapOS Master web page, click ``Servers`` and them ``Token``.
A token is valid for a single ``node register`` command and will expire after one day.
The deprecated ``--login`` and ``--password`` options can be used with old SlapOS servers
that have no support for the token.
..
XXX-Cedric should be like this: If desired node name is already taken, will raise an error.
XXX-Cedric: --master-url-web url will disappear in REST API. Currently, "register" uses
......@@ -298,6 +302,19 @@ Return values:
* 2 At least one promise has failed.
node collect
~~~~~~~~~~~~~
.. program-output:: python slapos help node collect
Return values:
**************
* 0 Everything went fine.
* 1 Fail to collect computer information.
node report
~~~~~~~~~~~
......@@ -386,8 +403,7 @@ from the SlapOS Master. They will be used for all the "slapos client" commands.
The command requires an authentication token, either provided as an argument,
or given at the interactive prompt.
Go to the SlapOS Master web page, click ``My Space``, then ``My Account``, then
``Generate a credential security token``.
Go to the SlapOS Master web page, click ``Account``, then ``Token``.
A token is valid for a single ``configure client`` command and will expire after one day.
......
......@@ -7,6 +7,9 @@ What is TioFormat?
TIO is a data format used to provide informations about consumption, invoicing
and state history.
This innformation is used by SlapOS Master to generated invoices and/or utilisation
reports.
XSD
---
......
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>action</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>action_type/object_jump</string>
</tuple>
</value>
</item>
<item>
<key> <string>category</string> </key>
<value> <string>object_jump</string> </value>
</item>
<item>
<key> <string>condition</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>icon</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>jump_to_related_open_order_line</string> </value>
</item>
<item>
<key> <string>permissions</string> </key>
<value>
<tuple>
<string>View</string>
</tuple>
</value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Action Information</string> </value>
</item>
<item>
<key> <string>priority</string> </key>
<value> <float>2.0</float> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Related Open Order Line</string> </value>
</item>
<item>
<key> <string>visible</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="Expression" module="Products.CMFCore.Expression"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string encoding="cdata"><![CDATA[
string:${object_url}/Base_jumpToRelatedObject?base_category=aggregate&portal_type=Open%20%Sale%20Order%20%Line&validation_state=validated
]]></string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="Expression" module="Products.CMFCore.Expression"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>python: portal.Base_checkPermission(\'subscription_request_module\', \'View\')</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>action</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>action_type/object_jump</string>
</tuple>
</value>
</item>
<item>
<key> <string>category</string> </key>
<value> <string>object_jump</string> </value>
</item>
<item>
<key> <string>condition</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>icon</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>related_payzen_event</string> </value>
</item>
<item>
<key> <string>permissions</string> </key>
<value>
<tuple>
<string>View</string>
</tuple>
</value>
</item>
<item>
<key> <string>priority</string> </key>
<value> <float>10.0</float> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Related Payzen Event</string> </value>
</item>
<item>
<key> <string>visible</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="Expression" module="Products.CMFCore.Expression"/>
</pickle>
<pickle>
<dictionary>
<item>
<ke