Update Release Candidate

component/vm-img/debian.cfg

@@ -18,6 +18,7 @@ recipe = slapos.recipe.build:vm.run
 environment = vm-run-environment
 vm = ${vm-debian:location}
 dist = ${vm-debian:dists}
+wait-ssh = 100
 
 [vm-debian]
 recipe = slapos.recipe.build:vm.install-debian

software/caddy-frontend/test/test.py

@@ -559,6 +559,7 @@ class SlaveHttpFrontendTestCase(SlapOSInstanceTestCase):
       cls.waitForCaddy()
     except BaseException:
       cls.logger.exception("Error during setUpClass")
+      cls._storeSnapshot("{}.setUpClass".format(cls.__name__))
       cls._cleanup()
       cls.setUp = lambda self: self.fail('Setup Class failed.')
       raise

software/neoppod/buildout.hash.cfg

@@ -30,7 +30,7 @@ md5sum = 9f27195d770b2f57461c60a82c851ab9
 
 [instance-neo]
 filename = instance-neo.cfg.in
-md5sum = d18e049d580720e733502b774b0d6790
+md5sum = 574acb0cae9af8ec2af52825fb2436d8
 
 [template-neo-my-cnf]
 filename = my.cnf.in

software/neoppod/instance-neo-input-schema.json

@@ -129,7 +129,7 @@
             "type": "object"
           },
           "engine": {
-            "description": "Configures storage engine, currently only InnoDB and TokuDB are supported. Defaults to NEO's default.",
+            "description": "Configures storage engine, currently only InnoDB, RocksDB and TokuDB are supported. Defaults to NEO's default.",
             "type": "string"
           }
         },

software/neoppod/instance-neo.cfg.in

@@ -90,7 +90,9 @@ cluster = {{ dumps(slapparameter_dict['cluster']) }}
 masters = {{ dumps(slapparameter_dict['masters']) }}
 database-adapter = {{ storage_type }}
 wait-database = -1
+{%- if mysql %}
 engine = ${my-cnf-parameters:engine}
+{%- endif %}
 dedup = {{ dumps(bool(slapparameter_dict.get('data-deduplication'))) }}
 disable-drop-partitions = {{ dumps(bool(slapparameter_dict.get('disable-drop-partitions'))) }}
 

software/slaprunner/buildout.hash.cfg

@@ -18,7 +18,7 @@ md5sum = 8b78e32b877d591400746ec7fd68ed4c
 
 [template-runner]
 filename = instance-runner.cfg
-md5sum = 85ea0b78fd18428c242438ebe95f980b
+md5sum = 87545b1f9f3865c8cb1347edeb340678
 
 [template-runner-import-script]
 filename = template/runner-import.sh.jinja2

software/slaprunner/instance-runner.cfg

@@ -115,7 +115,7 @@ name = custom_frontend_ready_promise.py
 config-command = $${custom-frontend-url-ready-promise-bin:rendered}
 
 [publish-connection-information]
-custom-frontend-url = $${custom-frontend-url-ready-promise:url}
+custom-frontend-url = $${custom-frontend-url-ready-promise-bin:url}
 {% endif %}
 
 # Create all needed directories

software/slaprunner/test/test.py

@@ -297,3 +297,18 @@ class TestInstanceResilient(SlaprunnerTestCase):
         'takeover-runner-1-url',
         'url',
         'webdav-url']))
+
+
+class TestCustomFrontend(SlaprunnerTestCase):
+  @classmethod
+  def getInstanceParameterDict(cls):
+    return {
+      'custom-frontend-backend-url': 'https://www.erp5.com',
+      'custom-frontend-backend-type': 'redirect',
+    }
+
+  def test(self):
+    parameter_dict = self.computer_partition.getConnectionParameterDict()
+    self.assertEqual(
+      parameter_dict['custom-frontend-url'],
+      'https://www.erp5.com')

stack/slapos.cfg

@@ -137,7 +137,7 @@ pytz = 2016.10
 requests = 2.13.0
 six = 1.12.0
 slapos.cookbook = 1.0.123
-slapos.core = 1.5.3
+slapos.core = 1.5.4
 slapos.extension.strip = 0.4
 slapos.extension.shared = 1.0
 slapos.libnetworkcache = 0.19