Commit 74e50506 authored by Jérome Perrin's avatar Jérome Perrin

software/slaprunner: run supervisord with explicit slapos.cfg argument

~/bin/slapos script does not overwrite $SLAPOS_CONFIGURATION if it's set,
to prevent service accidentally use another slapos.cfg if $SLAPOS_CONFIGURATION
is set for some reason, explicit pass the path of the slapos.cfg
parent 69f9c062
Pipeline #11832 failed with stage
in 0 seconds
...@@ -18,7 +18,7 @@ md5sum = 8d6878ff1d2e75010c50a1a2b0c13b24 ...@@ -18,7 +18,7 @@ md5sum = 8d6878ff1d2e75010c50a1a2b0c13b24
[template-runner] [template-runner]
filename = instance-runner.cfg filename = instance-runner.cfg
md5sum = caebb152b129e2e0270fe7fb5dca4284 md5sum = 4a3e1ee61f49909fe3fd0843cde1bebe
[template-runner-import-script] [template-runner-import-script]
filename = template/runner-import.sh.jinja2 filename = template/runner-import.sh.jinja2
......
...@@ -20,6 +20,7 @@ common-runner-parts = ...@@ -20,6 +20,7 @@ common-runner-parts =
runtestsuite runtestsuite
shellinabox shellinabox
shellinabox-service shellinabox-service
template-slapuser-script
slapos-cfg slapos-cfg
slapformat-definition.cfg slapformat-definition.cfg
cron-entry-prepare-software cron-entry-prepare-software
...@@ -215,8 +216,7 @@ default_repository_branch = $${slap-parameter:slapos-reference} ...@@ -215,8 +216,7 @@ default_repository_branch = $${slap-parameter:slapos-reference}
#-- supervisord managing slaprunner instance processes #-- supervisord managing slaprunner instance processes
[slaprunner-supervisord-wrapper] [slaprunner-supervisord-wrapper]
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
# XXX hardcoded locations command-line = ${buildout:bin-directory}/slapos node supervisord --cfg=$${slaprunner:slapos.cfg} --nodaemon
command-line = $${template-slapuser-script:rendered} node supervisord -n
wrapper-path = $${directory:services}/slaprunner-supervisord wrapper-path = $${directory:services}/slaprunner-supervisord
hash-existing-files = $${buildout:directory}/software_release/buildout.cfg hash-existing-files = $${buildout:directory}/software_release/buildout.cfg
......
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