Commit 92a55408 authored by Xavier Thompson's avatar Xavier Thompson

software/theia: Improve request script template

parent 56bd8ce5
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
[instance] [instance]
filename = instance.cfg.in filename = instance.cfg.in
md5sum = c9eccc7d972bc939b552672331b5a56e md5sum = bfd488ba023f505be25d947ec830bab3
[yarn.lock] [yarn.lock]
filename = yarn.lock filename = yarn.lock
......
...@@ -7,7 +7,7 @@ theia-environment-parts = ...@@ -7,7 +7,7 @@ theia-environment-parts =
slapos-repository slapos-repository
runner-link runner-link
settings.json settings.json
request-script request-script-template
theia-parts = theia-parts =
frontend-reload frontend-reload
...@@ -551,17 +551,19 @@ recipe = slapos.cookbook:symbolic.link ...@@ -551,17 +551,19 @@ recipe = slapos.cookbook:symbolic.link
target-directory = $${directory:project} target-directory = $${directory:project}
link-binary = $${directory:runner} link-binary = $${directory:runner}
[request-script] [request-script-template]
recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
rendered = $${directory:project}/$${:_buildout_section_name_}.sh rendered = $${directory:project}/$${:_buildout_section_name_}.sh
mode = 0700 mode = 0700
template = template =
inline:#!/bin/sh inline:#!/bin/sh
software_name=html5as-base #replace the software name # This template is generated automatically, copy it in order to supply and request.
# Any manual change to this file may be lost.
software_name=html5as-base #replace the software name writen in ~/srv/project/slapos/software/
software_release_uri=~/srv/project/slapos/software/$software_name/software.cfg software_release_uri=~/srv/project/slapos/software/$software_name/software.cfg
# slapos supply is used to add the software to the software list to be supplied to a node. # slapos supply is used to add the software to the software list to be supplied to a node.
slapos supply $software_release_uri slaprunner slapos supply $software_release_uri slaprunner
# slapos request the allocation of an instance to the master. # slapos request the allocation of an instance to the master.
# slapos request also gets status and parameters of the instance if it has any # slapos request also gets status and parameters of the instance if it has any
# (slapos request is meant to be run multiple time until you get the status). # (slapos request is meant to be run multiple time until you get the status).
slapos request $software_name'_1' $software_release_uri slapos request $software_name'_1' $software_release_uri
...@@ -183,7 +183,7 @@ class TestTheia(TheiaTestCase): ...@@ -183,7 +183,7 @@ class TestTheia(TheiaTestCase):
self.computer_partition_root_path, self.computer_partition_root_path,
'srv', 'srv',
'project', 'project',
'request-script.sh', 'request-script-template.sh',
) )
self.assertTrue(os.path.exists(script_path)) self.assertTrue(os.path.exists(script_path))
......
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