Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos
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
5
Merge Requests
5
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jérome Perrin
slapos
Commits
e2fc4c4b
Commit
e2fc4c4b
authored
Mar 05, 2012
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Working stack for occi
parent
0095fc58
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
30 additions
and
17 deletions
+30
-17
software/occi-xwiki/software.cfg
software/occi-xwiki/software.cfg
+4
-5
stack/occi/buildout.cfg
stack/occi/buildout.cfg
+24
-8
stack/occi/instance-occi.cfg
stack/occi/instance-occi.cfg
+2
-4
stack/occi/instance.cfg
stack/occi/instance.cfg
+0
-0
No files found.
software/occi-xwiki/software.cfg
View file @
e2fc4c4b
[buildout]
[buildout]
extends =
extends =
../../stack/occi.cfg
../../stack/occi
/buildout
.cfg
parts =
parts =
templat
e
instanc
e
templat
e-occi
instanc
e-occi
occi
accords
eggs
eggs
instance-recipe-egg
occi-xwiki-manifest
occi-xwiki-manifest
[occi-xwiki-manifest]
[occi-xwiki-manifest]
...
...
stack/occi/buildout.cfg
View file @
e2fc4c4b
...
@@ -10,11 +10,10 @@ extends =
...
@@ -10,11 +10,10 @@ extends =
versions = versions
versions = versions
parts =
parts =
templat
e
instanc
e
templat
e-occi
instanc
e-occi
occi
accords
eggs
eggs
template
[eggs]
[eggs]
recipe = zc.recipe.egg
recipe = zc.recipe.egg
...
@@ -22,21 +21,38 @@ eggs =
...
@@ -22,21 +21,38 @@ eggs =
${lxml-python:egg}
${lxml-python:egg}
# If we use only one software type in the future, delete duplication of template
# If we use only one software type in the future, delete duplication of template
[
templat
e]
[
instanc
e]
# Default template for the instance.
# Default template for the instance.
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg
url = ${:_profile_base_location_}/instance.cfg
md5sum = 3e1ea477d48080e9bdb98579f7f28be6
#
md5sum = 3e1ea477d48080e9bdb98579f7f28be6
output = ${buildout:directory}/template.cfg
output = ${buildout:directory}/template.cfg
mode = 0644
mode = 0644
[
templat
e-occi]
[
instanc
e-occi]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-occi.cfg
url = ${:_profile_base_location_}/instance-occi.cfg
md5sum = 737a6d2f1ea9938b8d76e2d35e18e482
#
md5sum = 737a6d2f1ea9938b8d76e2d35e18e482
output = ${buildout:directory}/template-occi.cfg
output = ${buildout:directory}/template-occi.cfg
mode = 0644
mode = 0644
[versions]
[versions]
# Use SlapOS patched zc.buildout
# Use SlapOS patched zc.buildout
zc.buildout = 1.6.0-dev-SlapOS-004
zc.buildout = 1.6.0-dev-SlapOS-004
[networkcache]
# Cedric de Saint Martin signature certificate
signature-certificate-list =
-----BEGIN CERTIFICATE-----
MIIB9jCCAV+gAwIBAgIJAO4V/jiMoICoMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
BAMMCENPTVAtMjMyMCAXDTEyMDIxNjExMTAyM1oYDzIxMTIwMTIzMTExMDIzWjAT
MREwDwYDVQQDDAhDT01QLTIzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
wi/3Z8W9pUiegUXIk/AiFDQ0UJ4JFAwjqr+HSRUirlUsHHT+8DzH/hfcTDX1I5BB
D1ADk+ydXjMm3OZrQcXjn29OUfM5C+g+oqeMnYQImN0DDQIOcUyr7AJc4xhvuXQ1
P2pJ5NOd3tbd0kexETa1LVhR6EgBC25LyRBRae76qosCAwEAAaNQME4wHQYDVR0O
BBYEFMDmW9aFy1sKTfCpcRkYnP6zUd1cMB8GA1UdIwQYMBaAFMDmW9aFy1sKTfCp
cRkYnP6zUd1cMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAskbFizHr
b6d3iIyN+wffxz/V9epbKIZVEGJd/6LrTdLiUfJPec7FaxVCWNyKBlCpINBM7cEV
Gn9t8mdVQflNqOlAMkOlUv1ZugCt9rXYQOV7rrEYJBWirn43BOMn9Flp2nibblby
If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
-----END CERTIFICATE-----
s
oftware/occi-xwik
i/instance-occi.cfg
→
s
tack/occ
i/instance-occi.cfg
View file @
e2fc4c4b
...
@@ -3,8 +3,6 @@ parts =
...
@@ -3,8 +3,6 @@ parts =
url
url
occi
occi
gzip-binary = ${gzip:location}/bin/gzip
eggs-directory = ${buildout:eggs-directory}
eggs-directory = ${buildout:eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory}
offline = true
offline = true
...
@@ -22,8 +20,8 @@ ip = $${slap-network-information:local-ipv4}
...
@@ -22,8 +20,8 @@ ip = $${slap-network-information:local-ipv4}
# Paths
# Paths
# Binary information
# Binary information
parser = ${
occi
:location}/bin/bc-parser
parser = ${
accords
:location}/bin/bc-parser
broker = ${
occi
:location}/bin/bc-broker
broker = ${
accords
:location}/bin/bc-broker
[rootdirectory]
[rootdirectory]
recipe = slapos.cookbook:mkdirectory
recipe = slapos.cookbook:mkdirectory
...
...
s
oftware/occi-xwik
i/instance.cfg
→
s
tack/occ
i/instance.cfg
View file @
e2fc4c4b
File moved
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