Commit 4f46ceb3 authored by Thomas Gambier's avatar Thomas Gambier 🚴🏼 Committed by Alain Takoudjou

[runner] fix parts for webrunner resilient

share parts with instance-runner.cfg

/cc @rafael @Nicolas @alain.takoudjou 

/reviewed-on nexedi/slapos!527
parent 90a4987e
......@@ -54,6 +54,7 @@ config-cpu-usage-ratio = 1
# This is a way to preserve the latest software release build speeding up
# the tests.)
config-software-root = ${buildout:directory}/../../soft
config-no-ipv4-frontend = true
# XXX hardcoded
#config-frontend-domain = google.com
# XXX Hack to deploy Root Instance on the same computer as the type-test Instance
......
......@@ -7,7 +7,7 @@ parts += template-erp5testnode
[template-resilient-test]
filename = instance-resilient-test.cfg.jinja2
md5sum = dadf1e8599ba7d96c5af827ec389a9cf
md5sum = b366f23bbac55d9686485dd2d9531a8b
[exporter-default-configuration]
# Define shorter interaction to speed up tests
......
......@@ -18,7 +18,7 @@ md5sum = f0cab61c7b8478afb8b676fc725d50d5
[template-runner]
filename = instance-runner.cfg
md5sum = a897ae4e90696516c4a6f831999f2c34
md5sum = 7c48c89f33ad243f0dffb3eeef8c56e8
[template-runner-import-script]
filename = template/runner-import.sh.jinja2
......@@ -30,7 +30,7 @@ md5sum = 1ed9526a6e5ac9a80e5b3add2d0a88fe
[instance-runner-export]
filename = instance-runner-export.cfg.in
md5sum = 7f87e6d220934eb13ab2b5d67dca8922
md5sum = 4b19026c50af55c8b7387aeaf624b47c
[template-resilient]
filename = instance-resilient.cfg.jinja2
......
......@@ -2,49 +2,9 @@
extends = {{ template_runner_path }}
{{ pbsready_export_template_path }}
parts +=
nginx_conf
nginx-launcher
certificate-authority
ca-nginx
certificate-authority-service
ca-nginx-service
logrotate-entry-nginx
gunicorn-launcher
gunicorn-graceful
publish-connection-information
slaprunner-promise
apache-httpd-promise
logrotate-entry-apache-httpd
slaprunner-supervisord-wrapper
runner-sshd-add-authorized-key
runner-sshd-graceful
runner-sshd-promise
runner-sshkeys-authority
runner-sshkeys-authority-service
runner-sshkeys-sshd
runner-sshkeys-sshd-service
runtestsuite
symlinks
shellinabox
shellinabox-service
slapos-cfg
cron-entry-prepare-software
deploy-instance-parameters
instance-software
instance-software-type
minishell-cwd
bash-profile
supervisord-wrapper
supervisord-promise
logrotate-entry-supervisord
logrotate-entry-slapgrid
httpd-graceful-wrapper
## Monitoring part
## Monitor for runner
monitor-base
monitor-check-resilient-feed-file
monitor-check-webrunner-internal-instance
# parts from {{ template_runner_path }} are overriden by
# {{ pbsready_export_template_path }} so we reinclude them here
parts += ${:common-runner-parts}
[directory]
recipe = slapos.cookbook:mkdirectory
......
[buildout]
parts =
common-runner-parts =
nginx_conf
nginx-launcher
certificate-authority
......@@ -50,6 +50,7 @@ parts =
## Usability part
template-slapuser-script
parts = $${:common-runner-parts}
extends = ${monitor2-template:rendered}
eggs-directory = ${buildout:eggs-directory}
......
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