Commit bf25c0c1 authored by Jérome Perrin's avatar Jérome Perrin

software/slaprunner: add a promise to check slapos proxy is available

parent 8d5910dc
...@@ -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 = 376ae851bb13bd88b02ecd72249a64bd md5sum = 782cc56a2bdd07411b230da469a7745f
[template-runner-import-script] [template-runner-import-script]
filename = template/runner-import.sh.jinja2 filename = template/runner-import.sh.jinja2
......
...@@ -30,6 +30,7 @@ common-runner-parts = ...@@ -30,6 +30,7 @@ common-runner-parts =
bash-profile bash-profile
supervisord-wrapper supervisord-wrapper
supervisord-promise supervisord-promise
slapos-proxy-promise
logrotate-entry-supervisord logrotate-entry-supervisord
logrotate-entry-slapgrid logrotate-entry-slapgrid
httpd-graceful-wrapper httpd-graceful-wrapper
...@@ -858,6 +859,13 @@ name = supervisord.py ...@@ -858,6 +859,13 @@ name = supervisord.py
config-hostname = $${slaprunner:ipv4} config-hostname = $${slaprunner:ipv4}
config-port = $${supervisord:port} config-port = $${supervisord:port}
[slapos-proxy-promise]
<= monitor-promise-base
module = check_port_listening
name = slaproxy.py
config-hostname = $${slaprunner:ipv4}
config-port = $${slaprunner:proxy_port}
# XXX Monitor # XXX Monitor
[monitor-instance-parameter] [monitor-instance-parameter]
monitor-httpd-port = $${slap-parameter:monitor-httpd-port} monitor-httpd-port = $${slap-parameter:monitor-httpd-port}
......
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