From 2fc2e2dc0180cc859449c4d0c1dd07f14f4ab463 Mon Sep 17 00:00:00 2001 From: Ivan Tyagov Date: Thu, 10 Nov 2016 08:32:24 +0200 Subject: [PATCH] Testnode frontend root is forbidden by default and only some public repositories if configured are public. Thus such a check will by design fail. @seb, @rafael please review. I tested this and it works. /reviewed-on https://lab.nexedi.com/nexedi/slapos/merge_requests/114 --- software/erp5testnode/instance-default.cfg | 9 --------- software/erp5testnode/software.cfg | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/software/erp5testnode/instance-default.cfg b/software/erp5testnode/instance-default.cfg index 71a9fe3ef..3168466a9 100644 --- a/software/erp5testnode/instance-default.cfg +++ b/software/erp5testnode/instance-default.cfg @@ -17,7 +17,6 @@ parts = monitor-base monitor-publish testnode-frontend - testnode-frontend-promise [monitor-publish] recipe = slapos.cookbook:publish @@ -175,14 +174,6 @@ config-https-only = true #software-type = custom-personal return = domain secure_access -[testnode-frontend-promise] -recipe = slapos.cookbook:check_url_available -path = $${basedirectory:promises}/testnode-http-frontend -url = $${testnode-frontend:connection-secure_access} -dash_path = $${monitor-frontend-promise:dash_path} -curl_path = $${monitor-frontend-promise:curl_path} -check-secure = 1 - [slap-parameter] node-quantity = 1 test-suite-master-url = diff --git a/software/erp5testnode/software.cfg b/software/erp5testnode/software.cfg index 191cbe422..77fbcc09f 100644 --- a/software/erp5testnode/software.cfg +++ b/software/erp5testnode/software.cfg @@ -61,7 +61,7 @@ recipe = slapos.recipe.template url = ${:_profile_base_location_}/instance-default.cfg output = ${buildout:directory}/template-default.cfg mode = 0644 -md5sum = 4d4f483d4531eedc321bdd6e460fc9df +md5sum = 8e171816b6caef52ac75c2f8f6a69fc3 [versions] PyXML = 0.8.5 -- 2.25.1