Commit 59e2d0b8 authored by Nicolas Wavrant's avatar Nicolas Wavrant

slaprunner : new parameter, used to clone a given git repository

parent fcbe7273
...@@ -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 = 646415d5e17cd46aa1362e01d76bdff5 md5sum = 017956cb6865c6204e2d63bcd776cd00
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 = 93f674a0c0d88b6d06d44b46b3643baf md5sum = 313adb3a040106d1b6b0ab5ed2f0fb11
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
......
...@@ -107,6 +107,7 @@ cloud9-url = $${cloud9:access-url} ...@@ -107,6 +107,7 @@ cloud9-url = $${cloud9:access-url}
wrapper = $${directory:services}/slaprunner wrapper = $${directory:services}/slaprunner
debug = $${slap-parameter:debug} debug = $${slap-parameter:debug}
access-url = https://[$${:ipv6}]:$${:runner_port} access-url = https://[$${:ipv6}]:$${:runner_port}
default_repo = $${slap-parameter:default_repo}
default_sr = $${slap-parameter:default_sr} default_sr = $${slap-parameter:default_sr}
[test-runner] [test-runner]
...@@ -396,6 +397,7 @@ instance-amount = 10 ...@@ -396,6 +397,7 @@ instance-amount = 10
debug = false debug = false
cloud9-frontend-domain = cloud9-frontend-domain =
frontend-domain = frontend-domain =
default_repo =
default_sr = default_sr =
[slapos-cfg] [slapos-cfg]
...@@ -429,6 +431,7 @@ context = ...@@ -429,6 +431,7 @@ context =
key cloud9_url slaprunner:cloud9-url key cloud9_url slaprunner:cloud9-url
key run_dir slaprunner:run_dir key run_dir slaprunner:run_dir
key log_dir slaprunner:log_dir key log_dir slaprunner:log_dir
key default_repo slaprunner:default_repo
key default_sr slaprunner:default_sr key default_sr slaprunner:default_sr
[environ] [environ]
......
...@@ -22,6 +22,7 @@ ipv6_address = {{ipv6}} ...@@ -22,6 +22,7 @@ ipv6_address = {{ipv6}}
etc_dir = {{etc_dir}} etc_dir = {{etc_dir}}
run_dir = {{run_dir}} run_dir = {{run_dir}}
log_dir = {{log_dir}} log_dir = {{log_dir}}
default_repo = {{default_repo}}
default_sr = {{default_sr}} default_sr = {{default_sr}}
[slapproxy] [slapproxy]
......
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