Commit aea2c7e4 authored by Nicolas Wavrant's avatar Nicolas Wavrant Committed by Cédric Le Ninivin

slaprunner: slapos-cfg template section lightened

parent 82eee7af
...@@ -103,7 +103,7 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_} ...@@ -103,7 +103,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 = 65dc3a88476b8e0366dbd40493ad4bc9 md5sum = e1608c965da48ab6b14b9ad88e8e5298
location = ${buildout:parts-directory}/${:_buildout_section_name_} location = ${buildout:parts-directory}/${:_buildout_section_name_}
filename = slapos.cfg.in filename = slapos.cfg.in
download-only = true download-only = true
......
...@@ -145,8 +145,8 @@ git-binary = ${git:location}/bin/git ...@@ -145,8 +145,8 @@ git-binary = ${git:location}/bin/git
slapos.cfg = $${directory:etc}/slapos.cfg slapos.cfg = $${directory:etc}/slapos.cfg
working-directory = $${runnerdirectory:home} working-directory = $${runnerdirectory:home}
project-directory = $${runnerdirectory:project} project-directory = $${runnerdirectory:project}
software-directory = $${runnerdirectory:software-root} instance_root = $${runnerdirectory:instance-root}
instance-directory = $${runnerdirectory:instance-root} software_root = $${runnerdirectory:software-root}
#XXX-Nico hardcoded default port because overridden by this buildout config #XXX-Nico hardcoded default port because overridden by this buildout config
instance-monitor-url = https://[$${:ipv6}]:9685 instance-monitor-url = https://[$${:ipv6}]:9685
etc_dir = $${directory:etc} etc_dir = $${directory:etc}
...@@ -157,17 +157,22 @@ public_key = $${sshkeys-dropbear-runner:public-key} ...@@ -157,17 +157,22 @@ public_key = $${sshkeys-dropbear-runner:public-key}
private_key = $${sshkeys-dropbear-runner:private-key} private_key = $${sshkeys-dropbear-runner:private-key}
ipv4 = $${slap-network-information:local-ipv4} ipv4 = $${slap-network-information:local-ipv4}
ipv6 = $${slap-network-information:global-ipv6} ipv6 = $${slap-network-information:global-ipv6}
instance_root = $${runnerdirectory:instance-root}
proxy_port = 50000 proxy_port = 50000
runner_port = 50005 runner_port = 50005
partition-amount = $${slap-parameter:instance-amount} partition-amount = $${slap-parameter:instance-amount}
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}
supd-temp-var = $${directory:etc}/supervisord.conf supervisord_config = $${directory:etc}/supervisord.conf
prox-db-var = $${slaprunner:working-directory}/proxy.db proxy_database = $${slaprunner:working-directory}/proxy.db
console = False console = False
verbose = False verbose = False
debug = False debug = False
auto_deploy = $${slap-parameter:auto-deploy}
auto_deploy_instance = $${slap-parameter:auto-deploy-instance}
autorun = $${slap-parameter:autorun}
knowledge0_file = $${buildout:directory}/$${public:filename}
[test-runner] [test-runner]
<= slaprunner <= slaprunner
...@@ -478,36 +483,7 @@ template = ${slapos-cfg-template:location}/${slapos-cfg-template:filename} ...@@ -478,36 +483,7 @@ template = ${slapos-cfg-template:location}/${slapos-cfg-template:filename}
rendered = $${slaprunner:slapos.cfg} rendered = $${slaprunner:slapos.cfg}
mode = 700 mode = 700
context = context =
key auto_deploy slap-parameter:auto-deploy section slaprunner slaprunner
key auto_deploy_instance slap-parameter:auto-deploy-instance
key autorun slap-parameter:autorun
key console slaprunner:console
key debug slaprunner:debug
key etc_dir slaprunner:etc_dir
key git slaprunner:git-binary
key instance_root runnerdirectory:instance-root
key instance_monitoring_url slaprunner:instance-monitor-url
key ipv4 slaprunner:ipv4
key ipv6 slaprunner:ipv6
raw knowledge0_file $${buildout:directory}/$${public:filename}
key log_dir slaprunner:log_dir
key partition_amount slaprunner:partition-amount
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 software_root runnerdirectory:software-root
key ssh_client slaprunner:ssh_client
key supervisor slaprunner:supervisor
key supervisord_config slaprunner:supd-temp-var
key verbose slaprunner:verbose
[shellinabox] [shellinabox]
recipe = slapos.cookbook:shellinabox recipe = slapos.cookbook:shellinabox
......
[slapos] [slapos]
software_root = {{ software_root }} software_root = {{ slaprunner['software_root'] }}
instance_root = {{instance_root }} instance_root = {{ slaprunner['instance_root'] }}
master_url = http://{{ ipv4 }}:{{ proxy_port }} master_url = http://{{ slaprunner['ipv4'] }}:{{ slaprunner['proxy_port'] }}
computer_id = slaprunner computer_id = slaprunner
maximal_delay = 0 maximal_delay = 0
[slapformat] [slapformat]
partition_amount = {{ partition_amount }} partition_amount = {{ slaprunner['partition-amount'] }}
[slaprunner] [slaprunner]
slapgrid_sr = {{ slapgrid_sr }} slapgrid_sr = {{ slaprunner['slapgrid_sr'] }}
slapgrid_cp = {{ slapgrid_cp }} slapgrid_cp = {{ slaprunner['slapgrid_cp'] }}
slapproxy = {{ slapproxy }} slapproxy = {{ slaprunner['slapproxy'] }}
supervisor = {{ supervisor }} supervisor = {{ slaprunner['supervisor'] }}
supervisord_config = {{ supervisord_config }} supervisord_config = {{ slaprunner['supervisord_config'] }}
runner_workdir = {{ runner_workdir }} runner_workdir = {{ slaprunner['working-directory'] }}
runner_host = {{ ipv4 }} runner_host = {{ slaprunner['ipv4'] }}
runner_port = {{ runner_port }} runner_port = {{ slaprunner['runner_port'] }}
instance_monitoring_url = {{ instance_monitoring_url }} instance_monitoring_url = {{ slaprunner['instance-monitor-url'] }}
ipv4_address = {{ ipv4 }} ipv4_address = {{ slaprunner['ipv4'] }}
ipv6_address = {{ ipv6 }} ipv6_address = {{ slaprunner['ipv6'] }}
etc_dir = {{ etc_dir }} etc_dir = {{ slaprunner['etc_dir'] }}
run_dir = {{ run_dir }} run_dir = {{ slaprunner['run_dir'] }}
log_dir = {{ log_dir }} log_dir = {{ slaprunner['log_dir'] }}
console = {{ console }} console = {{ slaprunner['console'] }}
verbose = {{ verbose }} verbose = {{ slaprunner['verbose'] }}
debug = {{ debug }} debug = {{ slaprunner['debug'] }}
auto_deploy = {{ auto_deploy }} auto_deploy = {{ slaprunner['auto_deploy'] }}
auto_deploy_instance = {{ auto_deploy_instance }} auto_deploy_instance = {{ slaprunner['auto_deploy_instance'] }}
autorun = {{ autorun }} autorun = {{ slaprunner['autorun'] }}
knowledge0_cfg = {{ knowledge0_file }} knowledge0_cfg = {{ slaprunner['knowledge0_file'] }}
[slapproxy] [slapproxy]
host = {{ proxy_host }} host = {{ slaprunner['ipv4'] }}
port = {{ proxy_port }} port = {{ slaprunner['proxy_port'] }}
database_uri = {{ proxy_database }} database_uri = {{ slaprunner['proxy_database'] }}
[sshkeys_authority] [sshkeys_authority]
ssh_client = {{ ssh_client }} ssh_client = {{ slaprunner['ssh_client'] }}
public_key = {{ public_key }} public_key = {{ slaprunner['public_key'] }}
private_key = {{ private_key }} private_key = {{ slaprunner['private_key'] }}
[gitclient] [gitclient]
git = {{ git }} git = {{ slaprunner['git-binary'] }}
[cloud9_IDE] [cloud9_IDE]
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