Commit cbcf4793 authored by Douglas's avatar Douglas

erp5testnode: automatically request a frontend instance and publish its url

This solves the issue of accessing any file hosted by the apache in every test node when there is no IPv6 access for the client.
parent 57d2e3ba
...@@ -16,6 +16,9 @@ parts = ...@@ -16,6 +16,9 @@ parts =
ca-httpd-testnode ca-httpd-testnode
monitor-base monitor-base
monitor-publish monitor-publish
testnode-frontend
testnode-frontend-promise
publish-frontend-information
[monitor-publish] [monitor-publish]
recipe = slapos.cookbook:publish recipe = slapos.cookbook:publish
...@@ -160,6 +163,30 @@ software = $${rootdirectory:srv}/software ...@@ -160,6 +163,30 @@ software = $${rootdirectory:srv}/software
shellinabox = $${rootdirectory:srv}/shellinabox shellinabox = $${rootdirectory:srv}/shellinabox
ca-dir = $${rootdirectory:srv}/ca ca-dir = $${rootdirectory:srv}/ca
[testnode-frontend]
<= slap-connection
recipe = slapos.cookbook:requestoptional
name = Test Node Frontend $${testnode:test-node-title}
# XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
slave = true
config-url = https://[$${testnode:httpd-ip}]:$${testnode:httpd-software-access-port}
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 = {{ dash_executable_location }}
curl_path = {{ curl_executable_location }}
check-secure = 1
[publish-frontend-information]
recipe = slapos.cookbook:publish
frontend-url = $${testnode-frontend:connection-secure_access}
[slap-parameter] [slap-parameter]
node-quantity = 1 node-quantity = 1
test-suite-master-url = test-suite-master-url =
......
...@@ -61,7 +61,7 @@ recipe = slapos.recipe.template ...@@ -61,7 +61,7 @@ recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-default.cfg url = ${:_profile_base_location_}/instance-default.cfg
output = ${buildout:directory}/template-default.cfg output = ${buildout:directory}/template-default.cfg
mode = 0644 mode = 0644
md5sum = 7fb3f4177dccac601d8fafd342af3c38 md5sum = 2799f1f8d2c86f6d357fe06a568b7c98
[versions] [versions]
PyXML = 0.8.5 PyXML = 0.8.5
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment