slaprunner: new parameter auto-deploy-instance

Conflicts:
	software/slaprunner/common.cfg
	software/slaprunner/instance-runner.cfg

software/slaprunner/README.txt

@@ -32,6 +32,9 @@ Default: 10
 AUTO-DEPLOYMENT
 ---------------
 
+for software
+~~~~~~~~~~~~
+
 You can automatically deploy a software release while deploying the webrunner itself, using the paramater XML.
 
 To do this, you only need to pass as a parameter named "slapos-software" : "AAA/BBB", where AAA is the folder of slapos.git where is located your BBB software.
@@ -43,6 +46,11 @@ It is also possible to download you own git repository, by providing the url in
 
 Last but not least, it is also possible to switch the branch with the parameter "slapos-reference" (by default pointing on master)
 
+for instance
+~~~~~~~~~~~~
+
+The parameter "auto-deploy-instance" can be explicitly set to allow or prevent the runner to deploy the instance at START TIME (if you manually restart the runner, or if the server reboots). Values : "true" or "false". Default value is "true"
+
 Resilience :
 ------------
 

software/slaprunner/common.cfg

@@ -49,7 +49,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-runner.cfg
 output = ${buildout:directory}/template-runner.cfg.in
-md5sum = b3288126400c4ca8469c255ef130dec9
+#md5sum = b3288126400c4ca8469c255ef130dec9
 mode = 0644
 
 [instance-runner-import]
@@ -100,7 +100,7 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
 [slapos-cfg-template]
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/template/${:filename}
-md5sum = 8207e74c7b97a4a3f3be390ea4f97ae1
+#md5sum = 8207e74c7b97a4a3f3be390ea4f97ae1
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 filename = slapos.cfg.in 
 download-only = true

software/slaprunner/instance-runner.cfg

@@ -394,6 +394,7 @@ slapos-repository = http://git.erp5.org/repos/slapos.git
 slapos-software =
 slapos-reference = master
 auto-deploy = true
+auto-deploy-instance = true
 
 [slapos-cfg]
 recipe = slapos.recipe.template:jinja2
@@ -403,30 +404,32 @@ mode = 700
 context =
   key software_root runnerdirectory:software-root
   key instance_root runnerdirectory:instance-root
+  key cloud9_url slaprunner:cloud9-url
+  key console slaprunner:console
+  key debug slaprunner:debug
+  key etc_dir slaprunner:etc_dir
+  key git slaprunner:git-binary
   key ipv4 slaprunner:ipv4
-  key proxy_port slaprunner:proxy_port
+  key ipv6 slaprunner:ipv6
+  key log_dir slaprunner:log_dir
   key partition_amount slaprunner:partition-amount
-  key slapgrid_sr slaprunner:slapgrid_sr 
+  key private_key slaprunner:private_key
+  key proxy_database slaprunner:prox-db-var
+  key proxy_host slaprunner:ipv4
+  key proxy_port slaprunner:proxy_port
+  key public_key slaprunner:public_key
+  key run_dir slaprunner:run_dir
+  key runner_port slaprunner:runner_port
+  key runner_workdir slaprunner:working-directory
   key slapgrid_cp slaprunner:slapgrid_cp
+  key slapgrid_sr slaprunner:slapgrid_sr 
   key slapproxy slaprunner:slapproxy 
+  key ssh_client slaprunner:ssh_client
   key supervisor slaprunner:supervisor
   key supervisord_config slaprunner:supd-temp-var
-  key runner_workdir slaprunner:working-directory
-  key runner_port slaprunner:runner_port
-  key ipv6 slaprunner:ipv6
-  key etc_dir slaprunner:etc_dir
-  key proxy_host slaprunner:ipv4
-  key proxy_database slaprunner:prox-db-var
-  key ssh_client slaprunner:ssh_client
-  key public_key slaprunner:public_key
-  key private_key slaprunner:private_key
-  key git slaprunner:git-binary
-  key run_dir slaprunner:run_dir
-  key log_dir slaprunner:log_dir
-  key console slaprunner:console
   key verbose slaprunner:verbose
-  key debug slaprunner:debug
   key auto_deploy slap-parameter:auto-deploy
+  key auto_deploy_instance slap-parameter:auto-deploy-instance
 
 [shellinabox]
 recipe = slapos.cookbook:shellinabox

software/slaprunner/template/slapos.cfg.in

@@ -26,6 +26,7 @@ console = {{ console }}
 verbose = {{ verbose }}
 debug = {{ debug }}
 auto_deploy = {{ auto_deploy }}
+auto_deploy_instance = {{ auto_deploy_instance }}
 
 [slapproxy]
 host = {{ proxy_host }}