Added the xslapos script to *instance*/bin

@Tyagov @alain.takoudjou @Nicolas @kirr 

/reviewed-on nexedi/slapos!158

software/slaprunner/buildout.hash.cfg

@@ -19,7 +19,7 @@ md5sum = 78e4c796b15a9c5b9b41c79a3c995ee7
 
 [template-runner]
 filename = instance-runner.cfg
-md5sum = c76c66c331f1f0d9f416c56ead53e804
+md5sum = a1c0f84761d90ce37aecf9745ca34493
 
 [template-runner-import-script]
 filename = template/runner-import.sh.jinja2
@@ -35,7 +35,7 @@ md5sum = 02023f89b622c49aee42130f839846a7
 
 [instance-runner-export]
 filename = instance-runner-export.cfg.in
-md5sum = 22a5dfe9bfc8533f8eab851e0996a6d7
+md5sum = 17f73015e0447e92d15d6fbc198297e5
 
 [template-resilient]
 filename = instance-resilient.cfg.jinja2
@@ -65,6 +65,10 @@ md5sum = f8446fcf254b4929eb828a9a1d7e5f62
 filename = template/bash_profile.in
 md5sum = 1c88cbca0c1e705eeb4b544ef4616097
 
+[template-bashrc]
+filename = template/bashrc.in
+md5sum = d0b9060ec96d4d5b188e36c84240ea7d
+
 [template-supervisord]
 filename = template/supervisord.conf.in
 md5sum = d294d0dafd265048399de6da8c96345f
@@ -80,3 +84,7 @@ md5sum = acaac32cf1bd45714272468a89f4f119
 [template-resilient-software-release-information]
 filename = template/resilient_software_release_information.py.in
 md5sum = 2451072826a9ad9425d62c9e9c7f6284
+
+[template-slapuser-script]
+filename = template/slapos-slapuser-script.in
+md5sum = becafae59ab9973724e0edb238f4cb7a

software/slaprunner/common.cfg

@@ -34,6 +34,7 @@ common-parts =
   instance-runner-import
   instance-runner-export
   template-slapos-cfg
+  template-slapuser-script
 # XXX: we have to manually add this for resilience
   rdiff-backup
   pbs-recipe-egg
@@ -137,6 +138,16 @@ filename = monitor-check-webrunner-internal-instances.py
 < = template-download-base
 filename = resilient_software_release_information.py.in
 
+[template-slapuser-script]
+< = template-download-base
+destination = ${buildout:parts-directory}/${:_buildout_section_name_}
+filename = slapos-slapuser-script.in
+
+[template-bashrc]
+< = template-download-base
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+filename = bashrc.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-slapuser-script
 
 [proxy-free-port]
 recipe = slapos.cookbook:free_port
@@ -104,3 +105,13 @@ context =
   key monitor_feed_directory monitor-directory:public
   raw base_url http://[${notifier:host}]:${notifier:port}/get/
   raw python_executable ${buildout:executable}
+  
+## Slapuser slapos command script
+[template-slapuser-script]
+recipe = slapos.recipe.template:jinja2
+template = ${buildout:parts-directory}/template-slapuser-script/slapos-slapuser-script.in
+rendered = $${buildout:bin-directory}/slapos
+mode = 0744
+context =
+  raw config_location $${slapos-cfg:rendered}
+  raw slapos_python_file_location ${buildout:bin-directory}/slapos

software/slaprunner/instance-runner.cfg

@@ -38,6 +38,8 @@ parts =
 ## Monitoring part
   monitor-base
   monitor-check-webrunner-internal-instance
+## Usability part
+  template-slapuser-script
 
 extends = ${monitor2-template:rendered}
 
@@ -713,6 +715,12 @@ context =
     raw path $PATH:${nano:location}/bin:${vim:location}/bin:${screen:location}/bin:${git:location}/bin:${curl:location}/bin:${python2.7:location}/bin:${tig:location}/bin:${zip:location}/bin
     key workdir runnerdirectory:home
     
+[bashrc]
+recipe = slapos.recipe.template:jinja2
+template = ${template-bashrc:location}/${template-bashrc:filename}
+rendered = $${buildout:directory}/.bashrc
+context =
+    raw bin_folder ${buildout:bin-directory}
 
 #---------------------------
 #--
@@ -816,3 +824,12 @@ rendered = $${monitor-directory:reports}/$${:filename}
 filename = monitor-check-webrunner-internal-instance
 mode = 0744
 
+## Slapuser slapos command script
+[template-slapuser-script]
+recipe = slapos.recipe.template:jinja2
+template = ${buildout:parts-directory}/template-slapuser-script/slapos-slapuser-script.in
+rendered = $${buildout:bin-directory}/slapos
+mode = 0744
+context =
+  raw config_location $${slapos-cfg:rendered}
+  raw slapos_python_file_location ${buildout:bin-directory}/slapos

software/slaprunner/template/bashrc.in

+export PATH={{ bin_folder }}:$PATH

software/slaprunner/template/slapos-slapuser-script.in

+#!/bin/sh
+# run slapos command inside slaprunner with appropriate config
+
+SLAPOS_CONFIGURATION={{ config_location }}   \
+SLAPOS_CLIENT_CONFIGURATION=$SLAPOS_CONFIGURATION   \
+exec {{ slapos_python_file_location }} "$@"