Merge branch 'master' into osoetraining

component/noVNC/buildout.cfg

@@ -4,5 +4,5 @@ parts =
 
 [noVNC]
 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

component/slapos/buildout.cfg

 [buildout]
 extends =
   ../../stack/shacache-client.cfg
+  ../m2crypto/buildout.cfg
   ../lxml-python/buildout.cfg
   ../python-2.7/buildout.cfg
 
@@ -29,26 +30,46 @@ allowed-eggs-from-site-packages =
 [lxml-python]
 python = python2.7
 
+[M2Crypto]
+python = python2.7
+
 [slapos]
 recipe = z3c.recipe.scripts
 python = python2.7
 eggs =
+  ${M2Crypto:egg}
   slapos.libnetworkcache
   zc.buildout
   ${lxml-python:egg}
   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]
 zc.buildout = 1.5.3-dev-SlapOS-005
-Jinja2 = 2.5.5
-Werkzeug = 0.6.2
+Jinja2 = 2.6
+M2Crypto = 0.21.1
+Werkzeug = 0.7.1
+buildout-versions = 1.6
 hexagonit.recipe.cmmi = 1.5.0
 lxml = 2.3
 meld3 = 0.6.7
 netaddr = 0.7.5
 setuptools = 0.6c12dev-r88846
 slapos.core = 0.12
-slapos.libnetworkcache = 0.2
+slapos.libnetworkcache = 0.4
 xml-marshaller = 0.9.7
 z3c.recipe.scripts = 1.0.1
 zc.recipe.egg = 1.3.2
@@ -71,5 +92,4 @@ supervisor = 3.0a10
 
 # Required by:
 # slapos.core==0.12
-zope.interface = 3.6.4
-
+zope.interface = 3.7.0

software/kvm/software.cfg

@@ -75,3 +75,11 @@ zc.recipe.egg = 1.3.2
 # Required by:
 # slapos.core==0.9
 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

@@ -13,3 +13,8 @@ url = ${:_profile_base_location_}/instance.cfg
 md5sum = 82e948e1c0cb0d5540ef185edeef3ec3
 output = ${buildout:directory}/template.cfg
 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

@@ -9,6 +9,7 @@ find-links =
     http://www.nexedi.org/static/packages/source/slapos.buildout/
     http://dist.repoze.org
     http://www.nexedi.org/static/packages/source/
+    http://www.owlfish.com/software/wsgiutils/download.html
 
 # Separate from site eggs
 allowed-eggs-from-site-packages =
@@ -26,6 +27,7 @@ allow-hosts =
   peak.telecommunity.com
   psutil.googlecode.com
   www.dabeaz.com
+  www.owlfish.com
 
 extends =
 # Exact version of Zope

stack/kvm.cfg

@@ -14,6 +14,21 @@ extends =
   ../component/dcron/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 =
   template
   gnutls
@@ -87,6 +102,7 @@ recipe = z3c.recipe.scripts
 eggs =
   ${lxml-python:egg}
   slapos.cookbook
+  numpy
 
 [versions]
 zc.buildout = 1.5.3-dev-SlapOS-005