slaprunner: manage supervisord by supervisor

Let the supervisord of slaprunner managing the instance processes
be managed by supervisord of slapos node.

Fixes problems of process like supervisord escaping control.

software/slaprunner/common.cfg

@@ -45,14 +45,14 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-runner.cfg
 output = ${buildout:directory}/template-runner.cfg.in
-md5sum = 27b20fe461b177f5ee53570f643cf0b7
+md5sum = 3cac749e81d8b94dbbf1f1833bc031ce
 mode = 0644
 
 [template-runner-import-script]
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/template/runner-import.sh.jinja2
 download-only = true
-#md5sum = a85d054b3e2ae9243d8d188c897dc121
+md5sum = 4134ea7e191d0c3b552d2efbae6b5894
 filename = runner-import.sh.jinja2
 mode = 0644
 
@@ -60,7 +60,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-runner-import.cfg.in
 output = ${buildout:directory}/instance-runner-import.cfg
-md5sum = 1e504da0fd4ce7f5130df9c5166dcc7c
+md5sum = e9e3692ce4af4d603666c969ec1964d2
 mode = 0644
 
 [template-runner-export-script]
@@ -75,7 +75,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-runner-export.cfg.in
 output = ${buildout:directory}/instance-runner-export.cfg
-md5sum = 2df7ed6a6dc1250b317ef1a4d1376e2b
+md5sum = aaf86d03409018b5d3dce2dea27287cf
 mode = 0644
 
 [template-resilient]

software/slaprunner/instance-runner-export.cfg.in

@@ -16,6 +16,7 @@ parts +=
   publish-connection-informations
   slaprunner-promise
   slaprunner-frontend-promise
+  slaprunner-supervisord-wrapper
   dropbear-promise
   runtestsuite
   shellinabox-promise

software/slaprunner/instance-runner-import.cfg.in

@@ -14,6 +14,7 @@ parts +=
   dropbear-server-add-authorized-key
   sshkeys-authority
   slaprunner-promise
+  slaprunner-supervisord-wrapper
   dropbear-promise
   runtestsuite
   shellinabox-promise

software/slaprunner/instance-runner.cfg

@@ -13,6 +13,7 @@ parts =
   publish-connection-informations
   slaprunner-promise
   slaprunner-frontend-promise
+  slaprunner-supervisord-wrapper
   dropbear-promise
   runtestsuite
   shellinabox-promise
@@ -192,6 +193,17 @@ software_info_json = $${runnerdirectory:home}/software_info.json
 instance_info_json = $${runnerdirectory:home}/instance_info.json
 path = $${shell:path}
 
+
+#---------------------------
+#--
+#-- supervisord managing slaprunner instance processes
+[slaprunner-supervisord-wrapper]
+recipe = slapos.cookbook:wrapper
+# XXX hardcoded locations
+command-line = $${buildout:directory}/bin/slapos node supervisord --cfg $${directory:etc}/slapos.cfg -n
+wrapper-path = $${directory:services}/slaprunner-supervisord
+
+
 [test-runner]
 <= slaprunner
 slapos.cfg = $${directory:etc}/slapos-test.cfg
@@ -630,6 +642,11 @@ context =
     raw path $PATH:${nano:location}/bin:${vim:location}/bin:${screen:location}/bin:${git:location}/bin:${curl:location}/bin:${python2.7:location}/bin
     key workdir runnerdirectory:home
 
+
+#---------------------------
+#--
+#-- supervisord managing slaprunner automation features
+
 [supervisord]
 autorestart = false
 autostart = false
@@ -698,6 +715,7 @@ path = $${directory:promises}/supervisord
 hostname = $${slaprunner:ipv4}
 port = $${supervisord:port}
 
+
 [monitor-current-log-access]
 < = monitor-directory-access
 source = $${directory:log}