Commit c1778540 by Jérome Perrin Committed by Rafael Monnerat

*.rst: fix syntax, a few typo and remove some outdated parts

1 parent f430b831
......@@ -16,9 +16,9 @@ Changes
1.4.10 (2018-09-20)
-------------------
* add `--buildout-debug` command line option to `slapos node software` and
`slapos node instance` commands which starts buildout debugger on errors.
* pretty print json serialised instance parameters in `slapos proxy show`
* add ``--buildout-debug`` command line option to ``slapos node software`` and
``slapos node instance`` commands which starts buildout debugger on errors.
* pretty print json serialised instance parameters in ``slapos proxy show``
* Add devperm plugin
1.4.9 (2018-07-31)
......@@ -64,7 +64,7 @@ Changes
* slapos.grid: rework checkpromise method to utils so it can be reused
1.4.3 (2017-11-08)
-----------------
------------------
* slapos.cli.grid: Allow definition of different pidfiles for each software subcommand in config file
* slapos.cli.configure_local: Get template locally instead do an http request.
* slapos.cli: Update API for get person certificates and register computer
......@@ -101,7 +101,7 @@ Changes
* slapos.grid: Save slapgrid state into the partition
* slapos.format: Remove passwd call while format.
* svcbackend: explicitely call the executable instead of using Popen 'executable' keyword.
* slapos.grid: Introduce new garbage collector for instances ignored by buildout
* slapos.grid: Introduce new garbage collector for instances ignored by buildout
1.3.16 (2016-09-29)
-------------------
......
......@@ -54,21 +54,21 @@ documentation.
request(product.kvm, "mykvm")
* "slap" is an instance of the SLAP library. It is only used for advanced usages.
"slap" instance is obtained by doing ::
slap = slapos.slap.slap()
slap.initializeConnection(config.master_url,
key_file=config.key_file, cert_file=config.cert_file)
"slap" instance is obtained by doing ::
slap = slapos.slap.slap()
slap.initializeConnection(config.master_url,
key_file=config.key_file, cert_file=config.cert_file)
Examples
~~~~~~~~
::
>>> # Request instance
>>> request(product.kvm, "myuniquekvm")
>>> # Request instance on specific computer
>>> request(product.kvm, "myotheruniquekvm",
filter_kw={ "computer_guid": "COMP-12345" })
......@@ -77,12 +77,12 @@ Examples
>>> request(product.kvm, "mythirduniquekvm",
partition_parameter_kw={"nbd_ip":"2a01:e35:2e27:460:e2cb:4eff:fed9:48dc",
"nbd_port":"1024"})
>>> # Request software installation on owned computer
>>> supply(product.kvm, "mycomputer")
>>> # Fetch existing instance status
>>> request(product.kvm, "myuniquekvm").getState()
>>> # Fetch instance information on already launched instance
>>> request(product.kvm, "myuniquekvm").getConnectionParameter("url")
grid
====
.. warning::
This section is outdated, ``slapgrid`` command was reorganised in ``slapos`` sub-commands.
slapgrid is a client of SLAPos. SLAPos provides support for deploying a SaaS
system in a minute.
Slapgrid allows you to easily deploy instances of softwares based on buildout
......
......@@ -3,7 +3,7 @@ slapos.manager
Manager is a plugin-like class that is being run in multiple phases of slapos node lifecycle.
- **format**, manager can format additionally the underlaying OS
- **format**, manager can format additionally the underlaying OS
- **software**, manager can react on software installation
- **instance**, manager can update instance runtime frequently
......
......@@ -3,14 +3,6 @@ slap
Simple Language for Accounting and Provisioning python library.
Developer note - python version
-------------------------------
This library is used on client (slapgrid) and server side.
Server is using python2.4 and client is using python2.6
Having this in mind, code of this library *have* to work
on python2.4
How it works
------------
......@@ -20,11 +12,10 @@ Each participating server is identified by a unique ID and runs a slap-server da
The data structure on the main server is the following:
A - Action: an action which can happen to provide a resource or account its usage
CP - Computer Partition: provides a URL to Access a Cloud Resource
RI - Resource Item: describes a resource
CI - Contract Item: describes the contract to attach the DL to (This is unclear still)
R - Resource: describes a type of cloud resource (ex. MySQL Table) is published on slapgrid.org
DL - Delivery Line: Describes an action happening on a resource item on a computer partition
D - Delivery: groups multiple Delivery Lines
* A - Action: an action which can happen to provide a resource or account its usage
* CP - Computer Partition: provides a URL to Access a Cloud Resource
* RI - Resource Item: describes a resource
* CI - Contract Item: describes the contract to attach the DL to (This is unclear still)
* R - Resource: describes a type of cloud resource (ex. MySQL Table) is published on slapgrid.org
* DL - Delivery Line: Describes an action happening on a resource item on a computer partition
* D - Delivery: groups multiple Delivery Lines
\ No newline at end of file
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!