Remove ugly hack where numpy is compiled at instance deployment. Use...

Remove ugly hack where numpy is compiled at instance deployment. Use soon-to-be-released websockify egg.

slapos/recipe/kvm/__init__.py

@@ -212,18 +212,8 @@ class Recipe(BaseSlapRecipe):
     noVNC_conf['source_ip']   = source_ip
     noVNC_conf['source_port'] = source_port
     
-    # Install numpy.
-    # XXX-Cedric : this looks like a hack. Do we have better solution, knowing
-    # That websockify is not an egg?
-    numpy = zc.buildout.easy_install.install(['numpy'], self.options['eggs-directory'])
-    environment = dict(PYTHONPATH='%s' % numpy.entries[0])
-
-    # Instanciate Websockify
-    websockify_runner_path = zc.buildout.easy_install.scripts([('websockify',
-      'slapos.recipe.librecipe.execute', 'executee_wait')], self.ws,
-      sys.executable, self.wrapper_directory, arguments=[
-        [sys.executable.strip(),
-         self.options['websockify_path'],
+    execute_arguments = [[
+        self.options['websockify'].strip(),
         '--web',
         self.options['noVNC_location'],
         '--key=%s' % (self.key_path),
@@ -231,11 +221,11 @@ class Recipe(BaseSlapRecipe):
         '--ssl-only',
         '%s:%s' % (source_ip, source_port),
         '%s:%s' % (target_ip, target_port)],
-        [self.certificate_path, self.key_path],
-        environment]
-       )[0]
+        [self.certificate_path, self.key_path]]
 
-    self.path_list.append(websockify_runner_path)
+    self.path_list.extend(zc.buildout.easy_install.scripts([('websockify',
+      'slapos.recipe.librecipe.execute', 'execute_wait')], self.ws, sys.executable,
+      self.wrapper_directory, arguments=execute_arguments))
 
     # Add noVNC promise
     self.port_listening_promise_conf.update(hostname=noVNC_conf['source_ip'],

software/kvm/instance.cfg

@@ -11,7 +11,7 @@ qemu_path = ${kvm:location}/bin/qemu-system-x86_64
 qemu_img_path = ${kvm:location}/bin/qemu-img
 #slapmonitor_path = ${buildout:bin-directory}/slapmonitor
 #slapreport_path = ${buildout:bin-directory}/slapreport
-websockify_path = ${noVNC:location}/utils/wsproxy.py
+websockify = ${buildout:directory}/bin/websockify
 noVNC_location = ${noVNC:location}
 openssl_binary = ${openssl:location}/bin/openssl
 rdiff_backup_binary = ${buildout:bin-directory}/rdiff-backup

software/kvm/software.cfg

@@ -5,7 +5,7 @@ extends =
 [template]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
-md5sum = d899f2111aab18ad25776f35ed49a91b
+md5sum = 298b146e4efce41bfd58b3f85d064ff1
 output = ${buildout:directory}/template.cfg
 mode = 0644
 

stack/kvm.cfg

@@ -102,5 +102,5 @@ recipe = z3c.recipe.scripts
 eggs =
   ${lxml-python:egg}
   slapos.cookbook
-  numpy
+  websockify