Update release candidate

component/jupyter/buildout.cfg

@@ -9,6 +9,7 @@ extends =
   ../scikit-learn/buildout.cfg
   ../pandas/buildout.cfg
   ../seaborn/buildout.cfg
+  ../h5py/buildout.cfg
 
 parts =
   jupyter
@@ -39,6 +40,10 @@ eggs =
   ${seaborn:egg}
   ${statsmodels:egg}
   patsy
+  ${h5py:egg}
+  openpyxl
+  sympy
+  xlrd
 # additional eggs for jupyterlab
   jupyterlab
   jupyterlab-launcher

component/zstd/buildout.cfg

@@ -5,7 +5,7 @@ parts =
 [zstd]
 recipe = slapos.recipe.cmmi
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
-url = https://github.com/facebook/zstd/archive/v1.3.3.tar.gz
-md5sum = 187f8df17a75a74f78a23ea4806ac65f
+url = https://github.com/facebook/zstd/archive/v1.3.4.tar.gz
+md5sum = 10bf0353e3dedd8bae34a188c25d4261
 configure-command = :
 make-options = PREFIX=${:location}

software/jupyter/software.cfg

@@ -151,3 +151,15 @@ jupyter-console = 5.1.0
 # Required by:
 # jupyter==1.0.0
 qtconsole = 4.3.0
+
+Cython = 0.28.2
+et-xmlfile = 1.0.1
+h5py = 2.7.1
+mpmath = 1.0.0
+openpyxl = 2.5.2
+sympy = 1.1.1
+xlrd = 1.1.0
+
+# Required by:
+# openpyxl==2.5.2
+jdcal = 1.4

software/kvm/instance-kvm-input-schema.json

@@ -84,18 +84,6 @@
       "minimum": 1,
       "maximum": 64
     },
-    "max-cpu-hotplug-count": {
-      "title": "Maximum hotpluggable CPU amount",
-      "description": "Specifies the maximum number of hotpluggable CPUs.",
-      "type": "integer",
-      "default": 1
-    },
-    "cpu-hotplug-amount": {
-      "title": "CPU hotplug amount",
-      "description": "Specifies the number of CPUs to hotplug",
-      "type": "integer",
-      "default": 0
-    },
     "numa": {
       "title": "Simulate a multi node NUMA system.",
       "description": "Simulate a multi node NUMA system. If mem and cpus are omitted, resources are split equally. Each numa option are separated by space: node,nodeid=4,cpus=40-49,mem=64g node,nodeid=1,cpus=10-19,mem=128g. Set this option if you know what you're doing.",
@@ -232,7 +220,7 @@
       "title": "Isolate the NAT Interface (No Internet access)",
       "description": "If this option is enabled, the NAT interface will be isolated, i.e. it will not be able to contact the host and no guest IP packets will be routed over the host to the outside. This option does not affect any explicitly set nat rules.",
       "type": "boolean",
-      "default": true
+      "default": false
     },
     "enable-vhost": {
       "title": "Use vhost-net to improve network performance of tap interface",

software/monitor/software.cfg

@@ -94,3 +94,17 @@ eggs +=
   slapos.recipe.cmmi
   hexagonit.recipe.download
   plone.recipe.command
+
+
+[versions]
+slapos.recipe.template = 4.3
+dnspython = 1.15.0
+erp5.util = 0.4.50
+passlib = 1.7.1
+GitPython = 2.1.9
+lockfile = 0.12.2
+apache-libcloud = 2.3.0
+feedparser = 5.2.1
+atomize = 0.2.0
+gitdb2 = 2.0.3
+smmap2 = 2.0.3

software/neoppod/software-zodb5.cfg

@@ -5,15 +5,15 @@ extends = software.cfg
 ZEO-patches =
 
 [versions]
-ZODB = 5.3.0
-ZEO = 5.1.0
-transaction = 2.1.2
+ZODB = 5.4.0
+ZEO = 5.2.0
+transaction = 2.2.1
 
 # Required by:
-# ZEO==5.1.0
-# trollius==2.1
-futures = 3.1.1
+# ZEO==5.2.0
+# trollius==2.2
+futures = 3.2.0
 
 # Required by:
-# ZEO==5.1.0
-trollius = 2.1
+# ZEO==5.2.0
+trollius = 2.2

software/re6stnet/software.cfg

@@ -29,6 +29,12 @@ eggs =
   slapos.toolbox
 scripts =
   slapos-kill
+  monitor.bootstrap
+  monitor.collect
+  monitor.genstatus
+  monitor.configwrite
+  is-process-older-than-dependency-set
+  check-free-disk
 
 [extra-eggs]
 recipe = zc.recipe.egg

software/slaprunner/buildout.hash.cfg

@@ -19,11 +19,11 @@ md5sum = 713db528880282d568278f09458d2aab
 
 [template-runner]
 filename = instance-runner.cfg
-md5sum = 111f9643078ab7fd27e6695f61ec837c
+md5sum = 04e31ac503753f89510dd412b4680c56
 
 [template-runner-import-script]
 filename = template/runner-import.sh.jinja2
-md5sum = 948a4a5fcb244131847e5df8480678e1
+md5sum = 1edd9c7a20e208b6cb647886bfb6d1bb
 
 [instance-runner-import]
 filename = instance-runner-import.cfg.in
@@ -35,7 +35,7 @@ md5sum = 98ce179badc6af5979a64a7c3d0a2ceb
 
 [instance-runner-export]
 filename = instance-runner-export.cfg.in
-md5sum = d1122988652127af5e252f1503eeacab
+md5sum = e0e62859fc00207e40af6acb402665fb
 
 [template-resilient]
 filename = instance-resilient.cfg.jinja2

software/slaprunner/instance-runner-export.cfg.in

@@ -33,6 +33,7 @@ parts +=
   supervisord-wrapper
   supervisord-promise
   logrotate-entry-supervisord
+  logrotate-entry-slapgrid
   httpd-graceful-wrapper
 ## Monitoring part
 ## Monitor for runner

software/slaprunner/instance-runner.cfg

@@ -30,6 +30,7 @@ parts =
   supervisord-wrapper
   supervisord-promise
   logrotate-entry-supervisord
+  logrotate-entry-slapgrid
   httpd-graceful-wrapper
 {% if slapparameter_dict.get('no-ipv4-frontend', 'false') == 'false' %}
   slaprunner-frontend-promise
@@ -798,6 +799,11 @@ name = supervisord
 log = $${directory:log}/slapproxy.log $${directory:log}/supervisord.log $${directory:log}/supervisord-errors.log
 post = kill -SIGUSR2 $(cat $${buildout:directory}/var/run/supervisord.pid)
 
+[logrotate-entry-slapgrid]
+<= logrotate-entry-base
+name = slapgrid
+log = $${runnerdirectory:home}/instance/*/.slapgrid/log/instance.log $${runnerdirectory:home}/instance/*/.slapgrid/promise/log/*.log
+
 [supervisord-promise]
 recipe = slapos.cookbook:check_port_listening
 path = $${directory:promises}/supervisord

software/slaprunner/software.cfg

@@ -16,6 +16,7 @@ gunicorn = 19.7.1
 prettytable = 0.7.2
 pycurl = 7.43.0
 slapos.recipe.template = 4.3
+collective.recipe.environment = 0.2.0
 slapos.toolbox = 0.76
 smmap = 0.9.0
 

software/slaprunner/template/runner-import.sh.jinja2

@@ -14,7 +14,7 @@ exec 2>&1
 echo -e "\n\n$0 run at : $(date)"
 
 srv_directory='{{ directory["srv"] }}'
-backup_directory='{{ directory["backup"] }}/../'
+backup_directory='{{ directory["backup"] }}'
 etc_directory='{{ directory["etc"] }}'
 
 RESTORE_EXIT_CODE_FILE='{{ restore_exit_code_file }}'

software/wendelin/software.cfg

@@ -86,4 +86,4 @@ revision = f785ac079b3ed602692c1b3a275d6d51a01eb453
 
 [versions]
 msgpack-python = 0.4.8
-wendelin.core = 0.11
+wendelin.core = 0.12

stack/monitor/buildout.hash.cfg

@@ -15,4 +15,4 @@
 # not need these here).
 [monitor2-template]
 filename = instance-monitor.cfg.jinja2.in
-md5sum = 86517ddccc86c76deaedf11066470550
+md5sum = b30c47a593299da9889035850a47c519

stack/monitor/instance-monitor.cfg.jinja2.in

@@ -153,7 +153,7 @@ password = ${monitor-instance-parameter:password}
 recipe = cns.recipe.symlink
 symlink =
   ${monitor-directory:promise-result} = ${monitor-directory:public}/promise
-  ${monitor-directory:promise-result} = ${monitor-directory:log}/promise
+  ${monitor-directory:promise-log} = ${monitor-directory:log}/promise
 
 [monitor-httpd-conf-parameter]
 listening-ip = ${monitor-instance-parameter:monitor-httpd-ipv6}

stack/slapos.cfg

@@ -50,6 +50,7 @@ allow-hosts +=
   bitbucket.org
   code.google.com
   effbot.org
+  files.pythonhosted.org
   github.com
   launchpad.net
   peak.telecommunity.com