Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
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
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Xiaowu Zhang
slapos
Commits
388b8906
Commit
388b8906
authored
Aug 23, 2011
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into osoetraining
parents
bb06a23a
5529534c
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
57 additions
and
6 deletions
+57
-6
component/noVNC/buildout.cfg
component/noVNC/buildout.cfg
+1
-1
component/slapos/buildout.cfg
component/slapos/buildout.cfg
+25
-5
software/kvm/software.cfg
software/kvm/software.cfg
+8
-0
software/nbd/software.cfg
software/nbd/software.cfg
+5
-0
stack/erp5.cfg
stack/erp5.cfg
+2
-0
stack/kvm.cfg
stack/kvm.cfg
+16
-0
No files found.
component/noVNC/buildout.cfg
View file @
388b8906
...
@@ -4,5 +4,5 @@ parts =
...
@@ -4,5 +4,5 @@ parts =
[noVNC]
[noVNC]
recipe = hexagonit.recipe.download
recipe = hexagonit.recipe.download
url = https://github.com/kanaka/noVNC/tarball/
master
url = https://github.com/kanaka/noVNC/tarball/
v0.1
strip-top-level-dir = true
strip-top-level-dir = true
component/slapos/buildout.cfg
View file @
388b8906
[buildout]
[buildout]
extends =
extends =
../../stack/shacache-client.cfg
../../stack/shacache-client.cfg
../m2crypto/buildout.cfg
../lxml-python/buildout.cfg
../lxml-python/buildout.cfg
../python-2.7/buildout.cfg
../python-2.7/buildout.cfg
...
@@ -29,26 +30,46 @@ allowed-eggs-from-site-packages =
...
@@ -29,26 +30,46 @@ allowed-eggs-from-site-packages =
[lxml-python]
[lxml-python]
python = python2.7
python = python2.7
[M2Crypto]
python = python2.7
[slapos]
[slapos]
recipe = z3c.recipe.scripts
recipe = z3c.recipe.scripts
python = python2.7
python = python2.7
eggs =
eggs =
${M2Crypto:egg}
slapos.libnetworkcache
slapos.libnetworkcache
zc.buildout
zc.buildout
${lxml-python:egg}
${lxml-python:egg}
slapos.core
slapos.core
# control scripts generation in order to avoid reinstalling bin/buildout
scripts =
generate-signature-key = slapos.signature:run
slapconsole = slapos.console:run
slapos-request = slapos.console:request
slapformat = slapos.format:main
slapgrid = slapos.grid.slapgrid:run
slapgrid-sr = slapos.grid.slapgrid:runSoftwareRelease
slapgrid-cp = slapos.grid.slapgrid:runComputerPartition
slapgrid-ur = slapos.grid.slapgrid:runUsageReport
slapgrid-supervisorctl = slapos.grid.svcbackend:supervisorctl
slapgrid-supervisord = slapos.grid.svcbackend:supervisord
slapproxy = slapos.proxy:main
[versions]
[versions]
zc.buildout = 1.5.3-dev-SlapOS-005
zc.buildout = 1.5.3-dev-SlapOS-005
Jinja2 = 2.5.5
Jinja2 = 2.6
Werkzeug = 0.6.2
M2Crypto = 0.21.1
Werkzeug = 0.7.1
buildout-versions = 1.6
hexagonit.recipe.cmmi = 1.5.0
hexagonit.recipe.cmmi = 1.5.0
lxml = 2.3
lxml = 2.3
meld3 = 0.6.7
meld3 = 0.6.7
netaddr = 0.7.5
netaddr = 0.7.5
setuptools = 0.6c12dev-r88846
setuptools = 0.6c12dev-r88846
slapos.core = 0.12
slapos.core = 0.12
slapos.libnetworkcache = 0.
2
slapos.libnetworkcache = 0.
4
xml-marshaller = 0.9.7
xml-marshaller = 0.9.7
z3c.recipe.scripts = 1.0.1
z3c.recipe.scripts = 1.0.1
zc.recipe.egg = 1.3.2
zc.recipe.egg = 1.3.2
...
@@ -71,5 +92,4 @@ supervisor = 3.0a10
...
@@ -71,5 +92,4 @@ supervisor = 3.0a10
# Required by:
# Required by:
# slapos.core==0.12
# slapos.core==0.12
zope.interface = 3.6.4
zope.interface = 3.7.0
software/kvm/software.cfg
View file @
388b8906
...
@@ -75,3 +75,11 @@ zc.recipe.egg = 1.3.2
...
@@ -75,3 +75,11 @@ zc.recipe.egg = 1.3.2
# Required by:
# Required by:
# slapos.core==0.9
# slapos.core==0.9
zope.interface = 3.6.4
zope.interface = 3.6.4
# Required by:
# novnc==0.1
numpy = 1.6.1
# XXX-CEDRIC Quick and dirty workaround to avoid m2crypto problems.
# should not be used elsewhere unless for urgent cases.
slapos.libnetworkcache = 0.2
software/nbd/software.cfg
View file @
388b8906
...
@@ -13,3 +13,8 @@ url = ${:_profile_base_location_}/instance.cfg
...
@@ -13,3 +13,8 @@ url = ${:_profile_base_location_}/instance.cfg
md5sum = 82e948e1c0cb0d5540ef185edeef3ec3
md5sum = 82e948e1c0cb0d5540ef185edeef3ec3
output = ${buildout:directory}/template.cfg
output = ${buildout:directory}/template.cfg
mode = 0644
mode = 0644
[versions]
# XXX-CEDRIC Quick and dirty workaround to avoid m2crypto problems.
# should not be used elsewhere unless for urgent cases.
slapos.libnetworkcache = 0.2
stack/erp5.cfg
View file @
388b8906
...
@@ -9,6 +9,7 @@ find-links =
...
@@ -9,6 +9,7 @@ find-links =
http://www.nexedi.org/static/packages/source/slapos.buildout/
http://www.nexedi.org/static/packages/source/slapos.buildout/
http://dist.repoze.org
http://dist.repoze.org
http://www.nexedi.org/static/packages/source/
http://www.nexedi.org/static/packages/source/
http://www.owlfish.com/software/wsgiutils/download.html
# Separate from site eggs
# Separate from site eggs
allowed-eggs-from-site-packages =
allowed-eggs-from-site-packages =
...
@@ -26,6 +27,7 @@ allow-hosts =
...
@@ -26,6 +27,7 @@ allow-hosts =
peak.telecommunity.com
peak.telecommunity.com
psutil.googlecode.com
psutil.googlecode.com
www.dabeaz.com
www.dabeaz.com
www.owlfish.com
extends =
extends =
# Exact version of Zope
# Exact version of Zope
...
...
stack/kvm.cfg
View file @
388b8906
...
@@ -14,6 +14,21 @@ extends =
...
@@ -14,6 +14,21 @@ extends =
../component/dcron/buildout.cfg
../component/dcron/buildout.cfg
../component/libpng/buildout.cfg
../component/libpng/buildout.cfg
#XXX-Cedric : Currently, one can only access to KVM using noVNC.
# Ideally one should be able to access KVM by using either NoVNC or VNC.
# Problem is : no native crypto support in web browsers. So we have to disable ssl
# In qemu builtin vnc server, and make it available only for localhost
# so that only novnc can listen to it.
#XXX-Cedric: Check status of https://github.com/kanaka/noVNC/issues/13 to see
# When qemu has builtin support for websockets in vnc server to get rid of
# Websockify (socket <-> websocket proxy server) when it is ready.
# May solve previous XXX depending on the implementation.
#XXX-Cedric: Check status of
# https://www.tiolive.com/nexedi/bug_module/20110819-11F4F70 for
# Chrome >= 14 and Firefox >=7 can access to noVNC.
parts =
parts =
template
template
gnutls
gnutls
...
@@ -87,6 +102,7 @@ recipe = z3c.recipe.scripts
...
@@ -87,6 +102,7 @@ recipe = z3c.recipe.scripts
eggs =
eggs =
${lxml-python:egg}
${lxml-python:egg}
slapos.cookbook
slapos.cookbook
numpy
[versions]
[versions]
zc.buildout = 1.5.3-dev-SlapOS-005
zc.buildout = 1.5.3-dev-SlapOS-005
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