diff --git a/software/slaprunner/common.cfg b/software/slaprunner/common.cfg index baabc22c41d1d838942a658ddb45709d3ced01f4..892a55aba1b8d4d3f3b99ff845ab3afa37a7bf41 100644 --- a/software/slaprunner/common.cfg +++ b/software/slaprunner/common.cfg @@ -81,13 +81,13 @@ mode = 0644 recipe = slapos.recipe.template url = ${:_profile_base_location_}/instance-runner-export.cfg.in output = ${buildout:directory}/instance-runner-export.cfg -md5sum = ae0851bf632aa932173024106f5b1bdf +md5sum = 994e355d713f90bcc17e4b54da65f354 mode = 0644 [template-resilient] recipe = slapos.recipe.download url = ${:_profile_base_location_}/instance-resilient.cfg.jinja2 -md5sum = 489cfdbe128c21ff5847f92d804fe460 +md5sum = aa9a99235571729ab93360c4712efa12 filename = instance-resilient.cfg.jinja2 mode = 0644 diff --git a/software/slaprunner/instance-resilient.cfg.jinja2 b/software/slaprunner/instance-resilient.cfg.jinja2 index 76cc44b3d8f25cc0a1e6cfabaf7031e210b1734c..bada94f4c18bcb2d433db86731d1960f4e93015a 100644 --- a/software/slaprunner/instance-resilient.cfg.jinja2 +++ b/software/slaprunner/instance-resilient.cfg.jinja2 @@ -22,7 +22,7 @@ offline = true # += because we need to take up parts (like instance-custom, slapmonitor etc) from the profile we extended parts += {{ parts.replicate("runner", number_of_instances + 1) }} - publish-connection-informations + publish-connection-information {{ replicated.replicate("runner", number_of_instances + 1, "runner-export", "runner-import", slapparameter_dict=slapparameter_dict) }} @@ -30,7 +30,7 @@ parts += [request-runner] return = url ssh-public-key ssh-url notification-id ip backend_url url ssh_command access_url 1_info 2_info monitor_url monitor_backend_url webdav_url public_url git_public_url git_private_url -[publish-connection-informations] +[publish-connection-information] recipe = slapos.cookbook:publish 1_info = ${request-runner:connection-1_info} 2_info = ${request-runner:connection-2_info} diff --git a/software/slaprunner/instance-runner-export.cfg.in b/software/slaprunner/instance-runner-export.cfg.in index fa345d0abf6b604f5032b7b049e1227deacf8ae4..923978168db1bdfb0abebcdf6d4f50160243b1fe 100644 --- a/software/slaprunner/instance-runner-export.cfg.in +++ b/software/slaprunner/instance-runner-export.cfg.in @@ -12,7 +12,7 @@ parts += sshkeys-dropbear-runner dropbear-server-add-authorized-key sshkeys-authority - publish-connection-informations + publish-connection-information slaprunner-promise slaprunner-frontend-promise slaprunner-supervisord-wrapper @@ -69,7 +69,7 @@ context = url = $${monitor-frontend:config-url}/$${deploy-index-template:filename} # Extends publish section with resilient parameters -[publish-connection-informations] +[publish-connection-information] <= resilient-publish-connection-parameter [monitor-check-resilient-feed-file]