Commit b56b1db3 authored by Alain Takoudjou's avatar Alain Takoudjou

slaprunner: do not overwrite srv path, keep slash at the end

The path of software release in webrunner is like: `/srv/slapgrid/slappartXX/srv//runner/project/slapos/software/soft/software.cfg`  because ~/srv directory in webrunner is set with a / at the end:

Changing that path will modify the URL of software release in webrunner, this is why we should always keep it as: `/srv/slapgrid/slappartXX/srv//`
parent ccfae597
......@@ -26,7 +26,7 @@ md5sum = e033845c9c24e4bb20caeedf19f9628a
[instance-runner-import]
filename = instance-runner-import.cfg.in
md5sum = 5cfa49bcf20612844e1c50a85740d0b3
md5sum = 7a879739afe55320ee96409bcc8a52ab
[template-runner-export-script]
filename = template/runner-export.sh.jinja2
......@@ -34,7 +34,7 @@ md5sum = 98ce179badc6af5979a64a7c3d0a2ceb
[instance-runner-export]
filename = instance-runner-export.cfg.in
md5sum = e0e62859fc00207e40af6acb402665fb
md5sum = 1a812a06cc02bb11636009f4ec043d54
[template-resilient]
filename = instance-resilient.cfg.jinja2
......
......@@ -41,6 +41,11 @@ parts +=
monitor-check-resilient-feed-file
monitor-check-webrunner-internal-instance
[directory]
recipe = slapos.cookbook:mkdirectory
# XXX - keep srv path with slash at the end.
srv = ${:home}/srv/
[proxy-free-port]
recipe = slapos.cookbook:free_port
minimum = 49980
......
......@@ -34,6 +34,12 @@ parts +=
monitor-base
[directory]
recipe = slapos.cookbook:mkdirectory
# XXX - keep srv path with slash at the end.
srv = ${:home}/srv/
# For the needs of importer, we run the full slaprunner
# In case both exporter and importer (aka main instance and clone instance)
# run with the same IP (usually for testing purposes),
......
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