More slaprunner promises

See merge request nexedi/slapos!833

software/slaprunner/buildout.hash.cfg

@@ -18,7 +18,7 @@ md5sum = 8d6878ff1d2e75010c50a1a2b0c13b24
 
 [template-runner]
 filename = instance-runner.cfg
-md5sum = 376ae851bb13bd88b02ecd72249a64bd
+md5sum = 4a3e1ee61f49909fe3fd0843cde1bebe
 
 [template-runner-import-script]
 filename = template/runner-import.sh.jinja2

software/slaprunner/instance-runner.cfg

@@ -20,6 +20,7 @@ common-runner-parts =
   runtestsuite
   shellinabox
   shellinabox-service
+  template-slapuser-script
   slapos-cfg
   slapformat-definition.cfg
   cron-entry-prepare-software
@@ -30,6 +31,8 @@ common-runner-parts =
   bash-profile
   supervisord-wrapper
   supervisord-promise
+  slapos-supervisord-promise
+  slapos-proxy-promise
   logrotate-entry-supervisord
   logrotate-entry-slapgrid
   httpd-graceful-wrapper
@@ -213,8 +216,7 @@ default_repository_branch = $${slap-parameter:slapos-reference}
 #-- supervisord managing slaprunner instance processes
 [slaprunner-supervisord-wrapper]
 recipe = slapos.cookbook:wrapper
-# XXX hardcoded locations
-command-line = $${template-slapuser-script:rendered} node supervisord -n
+command-line = ${buildout:bin-directory}/slapos node supervisord --cfg=$${slaprunner:slapos.cfg} --nodaemon
 wrapper-path = $${directory:services}/slaprunner-supervisord
 hash-existing-files = $${buildout:directory}/software_release/buildout.cfg
 
@@ -858,6 +860,19 @@ name = supervisord.py
 config-hostname = $${slaprunner:ipv4}
 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
 [monitor-instance-parameter]
 monitor-httpd-port = $${slap-parameter:monitor-httpd-port}