Commit 7a1d08e4 authored by Nicolas Wavrant's avatar Nicolas Wavrant

slaprunner : new parameter auto_deploy

to choose if we want to deploy the given default_sr or not at the first run
parent 5156a99f
...@@ -88,7 +88,7 @@ mode = 0644 ...@@ -88,7 +88,7 @@ mode = 0644
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-runner.cfg url = ${:_profile_base_location_}/instance-runner.cfg
output = ${buildout:directory}/template-runner.cfg output = ${buildout:directory}/template-runner.cfg
md5sum = 3c0abbc33afd7145e6bfc332e37b5ff0 md5sum = 8c1f4f58fa8c030317a9a914d0ab63f5
mode = 0644 mode = 0644
[instance-runner-import] [instance-runner-import]
...@@ -137,7 +137,7 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_} ...@@ -137,7 +137,7 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
[slapos-cfg-template] [slapos-cfg-template]
recipe = hexagonit.recipe.download recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/template/${:filename} url = ${:_profile_base_location_}/template/${:filename}
md5sum = 313adb3a040106d1b6b0ab5ed2f0fb11 md5sum = 6e638ef25accd350744f330ce8bde4cc
location = ${buildout:parts-directory}/${:_buildout_section_name_} location = ${buildout:parts-directory}/${:_buildout_section_name_}
filename = slapos.cfg.in.j2 filename = slapos.cfg.in.j2
download-only = true download-only = true
......
...@@ -109,6 +109,7 @@ debug = $${slap-parameter:debug} ...@@ -109,6 +109,7 @@ debug = $${slap-parameter:debug}
access-url = https://[$${:ipv6}]:$${:runner_port} access-url = https://[$${:ipv6}]:$${:runner_port}
default_repo = $${slap-parameter:default_repo} default_repo = $${slap-parameter:default_repo}
default_sr = $${slap-parameter:default_sr} default_sr = $${slap-parameter:default_sr}
auto_deploy = $${slap-parameter:auto_deploy}
[test-runner] [test-runner]
<= slaprunner <= slaprunner
...@@ -399,6 +400,7 @@ cloud9-frontend-domain = ...@@ -399,6 +400,7 @@ cloud9-frontend-domain =
frontend-domain = frontend-domain =
default_repo = http://git.erp5.org/repos/slapos.git default_repo = http://git.erp5.org/repos/slapos.git
default_sr = default_sr =
auto_deploy = 1
[slapos-cfg] [slapos-cfg]
recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
...@@ -433,6 +435,7 @@ context = ...@@ -433,6 +435,7 @@ context =
key log_dir slaprunner:log_dir key log_dir slaprunner:log_dir
key default_repo slaprunner:default_repo key default_repo slaprunner:default_repo
key default_sr slaprunner:default_sr key default_sr slaprunner:default_sr
key auto_deploy slaprunner:auto_deploy
[environ] [environ]
recipe = collective.recipe.environment recipe = collective.recipe.environment
......
...@@ -24,6 +24,7 @@ run_dir = {{run_dir}} ...@@ -24,6 +24,7 @@ run_dir = {{run_dir}}
log_dir = {{log_dir}} log_dir = {{log_dir}}
default_repo = {{default_repo}} default_repo = {{default_repo}}
default_sr = {{default_sr}} default_sr = {{default_sr}}
auto_deploy = {{auto_deploy}}
[slapproxy] [slapproxy]
host = {{proxy_host}} host = {{proxy_host}}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment