Added the xslapos script to instance/bin

software/slaprunner/buildout.hash.cfg

@@ -19,7 +19,7 @@ md5sum = 02755403c9f0b52d717160b0b2d0cfb7
 
 [template-runner]
 filename = instance-runner.cfg
-md5sum = 07905ec872e84bc42c6ab089f5270ac2
+md5sum = 14aca604f535f204750f9a3ffb2a34a7
 
 [template-runner-import-script]
 filename = template/runner-import.sh.jinja2
@@ -35,7 +35,7 @@ md5sum = 86a429492dba25364f6ec2b318ba1f85
 
 [instance-runner-export]
 filename = instance-runner-export.cfg.in
-md5sum = 852a2ed99af566d27e5e4403334a3376
+md5sum = 91c500cdb401552c1fc738b8abdac2ac
 
 [template-resilient]
 filename = instance-resilient.cfg.jinja2
@@ -80,3 +80,7 @@ md5sum = acaac32cf1bd45714272468a89f4f119
 [template-resilient-software-release-information]
 filename = template/resilient_software_release_information.py.in
 md5sum = 2451072826a9ad9425d62c9e9c7f6284
+
+[template-slapos-script]
+filename = template/slapos-script.in
+md5sum = 080ab12b0653cff9b11e8fc1bfa08ca2

software/slaprunner/common.cfg

@@ -34,6 +34,7 @@ common-parts =
   instance-runner-import
   instance-runner-export
   template-slapos-cfg
+  template-slapos-script
 # XXX: we have to manually add this for resilience
   rdiff-backup
   pbs-recipe-egg
@@ -137,6 +138,11 @@ filename = monitor-check-webrunner-internal-instances.py
 < = template-download-base
 filename = resilient_software_release_information.py.in
 
+[template-slapos-script]
+< = template-download-base
+destination = ${buildout:parts-directory}/${:_buildout_section_name_}
+filename = slapos-script.in
+
 [eggs]
 recipe = zc.recipe.egg
 eggs =

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

@@ -36,6 +36,7 @@ parts +=
   monitor-base
   monitor-check-resilient-feed-file
   monitor-check-webrunner-internal-instance
+  template-slapos-script
 
 [proxy-free-port]
 recipe = slapos.cookbook:free_port

software/slaprunner/instance-runner.cfg

@@ -38,6 +38,7 @@ parts =
 ## Monitoring part
   monitor-base
   monitor-check-webrunner-internal-instance
+  template-slapos-script
 
 extends = ${monitor2-template:rendered}
 
@@ -816,3 +817,11 @@ rendered = $${monitor-directory:reports}/$${:filename}
 filename = monitor-check-webrunner-internal-instance
 mode = 0744
 
+[template-slapos-script]
+recipe = slapos.recipe.template:jinja2
+template = ${buildout:parts-directory}/template-slapos-script/slapos-script.in
+rendered = $${buildout:bin-directory}/slapos
+mode = 0744
+context =
+  raw config_location $${slapos-cfg:rendered}
+

software/slaprunner/template/slapos-script.in

+#!/bin/sh
+# run slapos command inside slaprunner with appropriate config
+
+SLAPOS_CONFIGURATION={{ config_location }}   \
+SLAPOS_CLIENT_CONFIGURATION=$SLAPOS_CONFIGURATION   \
+exec slapos "$@"
\ No newline at end of file