Commit 5486ae80 authored by Thomas Gambier's avatar Thomas Gambier :bicyclist_tone2:

More slaprunner promises

See merge request nexedi/slapos!833
parents b1c29b32 74e50506
...@@ -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 = 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
...@@ -30,6 +31,8 @@ common-runner-parts = ...@@ -30,6 +31,8 @@ common-runner-parts =
bash-profile bash-profile
supervisord-wrapper supervisord-wrapper
supervisord-promise supervisord-promise
slapos-supervisord-promise
slapos-proxy-promise
logrotate-entry-supervisord logrotate-entry-supervisord
logrotate-entry-slapgrid logrotate-entry-slapgrid
httpd-graceful-wrapper httpd-graceful-wrapper
...@@ -213,8 +216,7 @@ default_repository_branch = $${slap-parameter:slapos-reference} ...@@ -213,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
...@@ -858,6 +860,19 @@ name = supervisord.py ...@@ -858,6 +860,19 @@ name = supervisord.py
config-hostname = $${slaprunner:ipv4} config-hostname = $${slaprunner:ipv4}
config-port = $${supervisord:port} config-port = $${supervisord:port}
[slapos-supervisord-promise]
<= monitor-promise-base
module = check_command_execute
name = instance_supervisord.py
config-command = ${buildout:bin-directory}/slapos node supervisorctl --cfg=$${slaprunner:slapos.cfg} pid
[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