Commit b7d7ea79 authored by Rafael Monnerat's avatar Rafael Monnerat

slaprunner: Remove section duplicated with instance-runner.cfg

  instance-runner-export.cfg.in extends instance-runner.cfg, so we don't need the secton here.
parent 3599de61
...@@ -35,7 +35,7 @@ md5sum = 02023f89b622c49aee42130f839846a7 ...@@ -35,7 +35,7 @@ md5sum = 02023f89b622c49aee42130f839846a7
[instance-runner-export] [instance-runner-export]
filename = instance-runner-export.cfg.in filename = instance-runner-export.cfg.in
md5sum = 17f73015e0447e92d15d6fbc198297e5 md5sum = 58b1a6a9c7df7178960199776cceffa0
[template-resilient] [template-resilient]
filename = instance-resilient.cfg.jinja2 filename = instance-resilient.cfg.jinja2
......
...@@ -36,7 +36,6 @@ parts += ...@@ -36,7 +36,6 @@ parts +=
monitor-base monitor-base
monitor-check-resilient-feed-file monitor-check-resilient-feed-file
monitor-check-webrunner-internal-instance monitor-check-webrunner-internal-instance
template-slapuser-script
  • @rafael I think there is a problem in this line. Actually the parts variable is not really extended from instance-runner.cfg (or I don't see why we need to duplicate all parts from instance-runner.cfg).

    I don't know why it isn't extended but what I know is that the section template-slapuser-script is not added to the parts in resilient webrunner... @jm @vpelletier @Nicolas do you know why it isn't extended ?

  • /cc @cedric.leninivin who started to help me debug this

  • You are right, you need to list this section into parts.

    I should had only removed the section bellow not the entry into the parts.

    Edited by Rafael Monnerat
  • @tomo : I think we duplicate the section entries in parts as we may wish to exclude some features from the runner-importer for exemple. But this makes the parts management very error-prone (developers who develop the webrunner always forget to make sure there changes work on the resilient webrunner too).

    Lately I've been working on cleaning the parts declaration in instance-runner-export and instance-runner-import : https://lab.nexedi.com/Nicolas/slapos/commits/runner-fix-parts-order . For this, I'm maintening a list of all parts processed (found in .installed-switch_softwaretype.cfg) before and after my changes, but there are many sections that are not included anymore...

  • So I dug a bit more into this buildout mess and posted on the forum : https://www.erp5.com/group_section/forum/buildout--extends-and---cheat-sheet-O0wP6uGjM1

Please register or sign in to reply
[proxy-free-port] [proxy-free-port]
recipe = slapos.cookbook:free_port recipe = slapos.cookbook:free_port
...@@ -105,13 +104,3 @@ context = ...@@ -105,13 +104,3 @@ context =
key monitor_feed_directory monitor-directory:public key monitor_feed_directory monitor-directory:public
raw base_url http://[${notifier:host}]:${notifier:port}/get/ raw base_url http://[${notifier:host}]:${notifier:port}/get/
raw python_executable ${buildout:executable} raw python_executable ${buildout:executable}
## Slapuser slapos command script
[template-slapuser-script]
recipe = slapos.recipe.template:jinja2
template = ${buildout:parts-directory}/template-slapuser-script/slapos-slapuser-script.in
rendered = $${buildout:bin-directory}/slapos
mode = 0744
context =
raw config_location $${slapos-cfg:rendered}
raw slapos_python_file_location ${buildout:bin-directory}/slapos
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