stack/slapos: new slapos-toolbox section

This section installs slapos.toolbox eggs with dependencies and install
scripts

software/nginx-push-stream/software.cfg

@@ -6,16 +6,13 @@ extends =
 
 parts =
   slapos-cookbook
+  slapos-toolbox
   nginx-push-stream-module
   nginx-push-stream
   template
   template-nginx-service
   template-nginx
 
-[slapos-cookbook]
-eggs +=
-  slapos.toolbox
-
 [template]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg.in

software/slaprunner/software.cfg

@@ -150,7 +150,7 @@ eggs =
   erp5.util
   lock-file
   slapos.recipe.build
-  slapos.toolbox[flask_auth]
+  ${slapos-toolbox:egg}[flask_auth]
   gunicorn
 # for gunicorn[gthread]
   futures

stack/monitor/buildout.cfg

@@ -7,9 +7,9 @@ extends =
   ../../component/dash/buildout.cfg
   ../../component/openssl/buildout.cfg
   ../../component/lxml-python/buildout.cfg
-  ../../component/pycurl/buildout.cfg
   ../../component/python-cryptography/buildout.cfg
   ../../stack/logrotate/buildout.cfg
+  ../../stack/slapos.cfg
 
 parts =
   slapos-cookbook
@@ -33,25 +33,14 @@ on-update = true
 recipe = zc.recipe.egg
 interpreter = monitor-pythonwitheggs
 eggs =
-  ${lxml-python:egg}
-  ${pycurl:egg}
-  ${python-cryptography:egg}
   plone.recipe.command
   collective.recipe.template
   cns.recipe.symlink
-  slapos.toolbox
-  slapos.core
   psutil
   PyRSS2Gen
   Jinja2
-scripts =
-  monitor.bootstrap
-  monitor.collect
-  monitor.statistic
-  monitor.runpromise
-  monitor.genstatus
-  monitor.configwrite
-  check-free-disk
+depends =
+  ${slapos-toolbox:recipe}
 
 
 # Monitor templates files

stack/slapos.cfg

@@ -30,6 +30,8 @@ extends =
   ../component/python-cachecontrol/buildout.cfg
   ../component/python-cryptography/buildout.cfg
   ../component/python-PyYAML/buildout.cfg
+  ../component/pycurl/buildout.cfg
+
 
 # Separate from site eggs
 allowed-eggs-from-site-packages =
@@ -98,6 +100,15 @@ eggs =
   pyOpenSSL
   slapos.cookbook
 
+# slapos.toolbox containing utilities
+[slapos-toolbox]
+recipe = zc.recipe.egg
+eggs =
+  ${lxml-python:egg}
+  ${pycurl:egg}
+  ${python-cryptography:egg}
+  slapos.toolbox
+
 # Install a slapos command with networkcache enabled in ${buildout:bin-directory}
 [slapos-command]
 recipe = zc.recipe.egg