Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Eric Zheng
slapos.core
Commits
c1778540
Commit
c1778540
authored
Nov 26, 2018
by
Jérome Perrin
Committed by
Rafael Monnerat
Nov 26, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
*.rst: fix syntax, a few typo and remove some outdated parts
parent
f430b831
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
27 additions
and
32 deletions
+27
-32
CHANGES.rst
CHANGES.rst
+5
-5
slapos/README.console.rst
slapos/README.console.rst
+10
-10
slapos/README.grid.rst
slapos/README.grid.rst
+4
-0
slapos/README.manager.rst
slapos/README.manager.rst
+1
-1
slapos/README.slap.rst
slapos/README.slap.rst
+7
-16
No files found.
CHANGES.rst
View file @
c1778540
...
@@ -16,9 +16,9 @@ Changes
...
@@ -16,9 +16,9 @@ Changes
1.4.10 (2018-09-20)
1.4.10 (2018-09-20)
-------------------
-------------------
* add `
--buildout-debug` command line option to `slapos node software
` and
* add `
`--buildout-debug`` command line option to ``slapos node software`
` and
`
slapos node instance
` commands which starts buildout debugger on errors.
`
`slapos node instance`
` commands which starts buildout debugger on errors.
* pretty print json serialised instance parameters in `
slapos proxy show
`
* pretty print json serialised instance parameters in `
`slapos proxy show`
`
* Add devperm plugin
* Add devperm plugin
1.4.9 (2018-07-31)
1.4.9 (2018-07-31)
...
@@ -64,7 +64,7 @@ Changes
...
@@ -64,7 +64,7 @@ Changes
* slapos.grid: rework checkpromise method to utils so it can be reused
* slapos.grid: rework checkpromise method to utils so it can be reused
1.4.3 (2017-11-08)
1.4.3 (2017-11-08)
-----------------
-----------------
-
* slapos.cli.grid: Allow definition of different pidfiles for each software subcommand in config file
* 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.configure_local: Get template locally instead do an http request.
* slapos.cli: Update API for get person certificates and register computer
* slapos.cli: Update API for get person certificates and register computer
...
@@ -101,7 +101,7 @@ Changes
...
@@ -101,7 +101,7 @@ Changes
* slapos.grid: Save slapgrid state into the partition
* slapos.grid: Save slapgrid state into the partition
* slapos.format: Remove passwd call while format.
* slapos.format: Remove passwd call while format.
* svcbackend: explicitely call the executable instead of using Popen 'executable' keyword.
* 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)
1.3.16 (2016-09-29)
-------------------
-------------------
...
...
slapos/README.console.rst
View file @
c1778540
...
@@ -54,21 +54,21 @@ documentation.
...
@@ -54,21 +54,21 @@ documentation.
request(product.kvm, "mykvm")
request(product.kvm, "mykvm")
* "slap" is an instance of the SLAP library. It is only used for advanced usages.
* "slap" is an instance of the SLAP library. It is only used for advanced usages.
"slap" instance is obtained by doing ::
"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 = slapos.slap.slap()
slap.initializeConnection(config.master_url,
key_file=config.key_file, cert_file=config.cert_file)
Examples
Examples
~~~~~~~~
~~~~~~~~
::
::
>>> # Request instance
>>> # Request instance
>>> request(product.kvm, "myuniquekvm")
>>> request(product.kvm, "myuniquekvm")
>>> # Request instance on specific computer
>>> # Request instance on specific computer
>>> request(product.kvm, "myotheruniquekvm",
>>> request(product.kvm, "myotheruniquekvm",
filter_kw={ "computer_guid": "COMP-12345" })
filter_kw={ "computer_guid": "COMP-12345" })
...
@@ -77,12 +77,12 @@ Examples
...
@@ -77,12 +77,12 @@ Examples
>>> request(product.kvm, "mythirduniquekvm",
>>> request(product.kvm, "mythirduniquekvm",
partition_parameter_kw={"nbd_ip":"2a01:e35:2e27:460:e2cb:4eff:fed9:48dc",
partition_parameter_kw={"nbd_ip":"2a01:e35:2e27:460:e2cb:4eff:fed9:48dc",
"nbd_port":"1024"})
"nbd_port":"1024"})
>>> # Request software installation on owned computer
>>> # Request software installation on owned computer
>>> supply(product.kvm, "mycomputer")
>>> supply(product.kvm, "mycomputer")
>>> # Fetch existing instance status
>>> # Fetch existing instance status
>>> request(product.kvm, "myuniquekvm").getState()
>>> request(product.kvm, "myuniquekvm").getState()
>>> # Fetch instance information on already launched instance
>>> # Fetch instance information on already launched instance
>>> request(product.kvm, "myuniquekvm").getConnectionParameter("url")
>>> request(product.kvm, "myuniquekvm").getConnectionParameter("url")
slapos/README.grid.rst
View file @
c1778540
grid
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
slapgrid is a client of SLAPos. SLAPos provides support for deploying a SaaS
system in a minute.
system in a minute.
Slapgrid allows you to easily deploy instances of softwares based on buildout
Slapgrid allows you to easily deploy instances of softwares based on buildout
...
...
slapos/README.manager.rst
View file @
c1778540
...
@@ -3,7 +3,7 @@ slapos.manager
...
@@ -3,7 +3,7 @@ slapos.manager
Manager is a plugin-like class that is being run in multiple phases of slapos node lifecycle.
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
- **software**, manager can react on software installation
- **instance**, manager can update instance runtime frequently
- **instance**, manager can update instance runtime frequently
...
...
slapos/README.slap.rst
View file @
c1778540
...
@@ -3,14 +3,6 @@ slap
...
@@ -3,14 +3,6 @@ slap
Simple Language for Accounting and Provisioning python library.
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
How it works
------------
------------
...
@@ -20,11 +12,10 @@ Each participating server is identified by a unique ID and runs a slap-server da
...
@@ -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:
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
* 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
* CP - Computer Partition: provides a URL to Access a Cloud Resource
RI - Resource Item: describes a resource
* RI - Resource Item: describes a resource
CI - Contract Item: describes the contract to attach the DL to (This is unclear still)
* 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
* 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
* DL - Delivery Line: Describes an action happening on a resource item on a computer partition
D - Delivery: groups multiple Delivery Lines
* D - Delivery: groups multiple Delivery Lines
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment