software/*: use python-with-eggs as section name

When we have a section to generate a python interpreter with eggs built
in, don't name this `extra-eggs` because the meaning is not clear.

software/kvm/buildout.hash.cfg

@@ -15,7 +15,7 @@
 
 [template]
 filename = instance.cfg.in
-md5sum = cad7d490b84a484b089e34b27a5675ff
+md5sum = 763f66b915839a9b073fb93f43a44493
 
 [template-kvm]
 filename = instance-kvm.cfg.jinja2

software/kvm/instance.cfg.in

@@ -87,7 +87,7 @@ extra-context =
   raw novnc_location ${noVNC:location}
   raw netcat_bin ${netcat:location}/bin/netcat
   raw python_executable ${buildout:executable}
-  raw python_eggs_executable ${buildout:bin-directory}/${extra-eggs:interpreter}
+  raw python_eggs_executable ${buildout:bin-directory}/${python-with-eggs:interpreter}
   raw qemu_executable_location ${kvm:location}/bin/qemu-system-x86_64
   raw qemu_img_executable_location ${kvm:location}/bin/qemu-img
   raw qemu_start_promise_tpl ${template-qemu-ready:location}/${template-qemu-ready:filename}

software/kvm/software.cfg

@@ -8,6 +8,7 @@ extends =
   ../../component/noVNC/buildout.cfg
   ../../component/openssl/buildout.cfg
   ../../component/netcat/buildout.cfg
+  ../../component/lxml-python/buildout.cfg
   ../../component/pycurl/buildout.cfg
   ../../component/gzip/buildout.cfg
   ../../stack/slapos.cfg
@@ -40,10 +41,12 @@ parts = ${:common-parts}
 
 #XXX-Cedric : add list of keyboard layouts (azerty/us querty/...) parameter to qemu
 
-[extra-eggs]
+[python-with-eggs]
 recipe = zc.recipe.egg
+interpreter = ${:_buildout_section_name_}
 eggs =
   ${python-cffi:egg}
+  ${lxml-python:egg}
   websockify
   slapos.cookbook
   erp5.util

software/slaprunner/buildout.hash.cfg

@@ -18,7 +18,7 @@ md5sum = ec70348dd71b319590a5c5837f3d2e45
 
 [template-runner]
 filename = instance-runner.cfg
-md5sum = dc3a7734b08977f438b35d441a12f628
+md5sum = f342daca2e87f8fa44fd7b6a2a1c22f8
 
 [template-runner-import-script]
 filename = template/runner-import.sh.jinja2

software/slaprunner/instance-runner.cfg

@@ -811,7 +811,7 @@ mode = 0744
 context =
     section supervisord supervisord
     section slaprunner slaprunner
-    raw python_executable ${buildout:bin-directory}/${extra-eggs:interpreter}
+    raw python_executable ${buildout:bin-directory}/${python-with-eggs:interpreter}
 
 [supervisord-wrapper]
 recipe = slapos.cookbook:wrapper

software/slaprunner/software-py3.cfg

@@ -9,7 +9,7 @@ python = python3
 common-parts -=
   rdiff-backup
 
-[extra-eggs]
+[python-with-eggs]
 eggs -=
 # futures is a backport of Py3's concurrent.futures module
   futures

software/slaprunner/software.cfg

@@ -143,14 +143,15 @@ filename = slapos-slapuser-script.in
 < = template-base
 output = ${buildout:directory}/buildout-shared-part-list
 
-[extra-eggs]
+[python-with-eggs]
 recipe = zc.recipe.egg
-interpreter = pythonwitheggs
+interpreter = ${:_buildout_section_name_}
 eggs =
+  ${slapos-toolbox:eggs}
   erp5.util
   lock-file
   slapos.recipe.build
-  ${slapos-toolbox:egg}[flask_auth]
+  slapos.toolbox[flask_auth]
   gunicorn
 # for gunicorn[gthread]
   futures
@@ -163,6 +164,7 @@ scripts =
   supervisord
   supervisorctl
 
+
 [versions]
 Flask-Auth = 0.85
 futures = 3.0.5