slaprunner: slapos-cfg template section lightened

software/slaprunner/common.cfg

@@ -103,11 +103,7 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
 [slapos-cfg-template]
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/template/${:filename}
-<<<<<<< HEAD
-md5sum = d31d1c51a51bc4b2b8dda197777a4bcb
-=======
-md5sum = 65dc3a88476b8e0366dbd40493ad4bc9
->>>>>>> 3f080e7... slaprunner: knowledge0 file path is transmitted to slaprunner throught slapos.cfg file
+md5sum = e1608c965da48ab6b14b9ad88e8e5298
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 filename = slapos.cfg.in
 download-only = true

software/slaprunner/instance-runner.cfg

@@ -145,8 +145,8 @@ git-binary = ${git:location}/bin/git
 slapos.cfg = $${directory:etc}/slapos.cfg
 working-directory = $${runnerdirectory:home}
 project-directory = $${runnerdirectory:project}
-software-directory = $${runnerdirectory:software-root}
-instance-directory = $${runnerdirectory:instance-root}
+instance_root = $${runnerdirectory:instance-root}
+software_root = $${runnerdirectory:software-root}
 #XXX-Nico hardcoded default port because overridden by this buildout config
 instance-monitor-url = https://[$${:ipv6}]:9685
 etc_dir = $${directory:etc}
@@ -157,17 +157,22 @@ public_key = $${sshkeys-dropbear-runner:public-key}
 private_key = $${sshkeys-dropbear-runner:private-key}
 ipv4 = $${slap-network-information:local-ipv4}
 ipv6 = $${slap-network-information:global-ipv6}
+instance_root = $${runnerdirectory:instance-root}
 proxy_port = 50000
 runner_port = 50005
 partition-amount = $${slap-parameter:instance-amount}
 wrapper = $${directory:services}/slaprunner
 debug = $${slap-parameter:debug}
 access-url = https://[$${:ipv6}]:$${:runner_port}
-supd-temp-var = $${directory:etc}/supervisord.conf
-prox-db-var = $${slaprunner:working-directory}/proxy.db
+supervisord_config = $${directory:etc}/supervisord.conf
+proxy_database = $${slaprunner:working-directory}/proxy.db
 console = False
 verbose = 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]
 <= slaprunner
@@ -478,36 +483,7 @@ template = ${slapos-cfg-template:location}/${slapos-cfg-template:filename}
 rendered = $${slaprunner:slapos.cfg}
 mode = 700
 context =
-  key auto_deploy slap-parameter:auto-deploy
-  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
+  section slaprunner slaprunner
 
 [shellinabox]
 recipe = slapos.cookbook:shellinabox

software/slaprunner/template/slapos.cfg.in

 [slapos]
-software_root = {{ software_root }}
-instance_root = {{instance_root }}
-master_url = http://{{ ipv4 }}:{{ proxy_port }}
+software_root = {{ slaprunner['software_root'] }}
+instance_root = {{ slaprunner['instance_root'] }}
+master_url = http://{{ slaprunner['ipv4'] }}:{{ slaprunner['proxy_port'] }}
 computer_id = slaprunner
 maximal_delay = 0
 
 [slapformat]
-partition_amount = {{ partition_amount }}
+partition_amount = {{ slaprunner['partition-amount'] }}
 
 [slaprunner]
-slapgrid_sr = {{ slapgrid_sr }}
-slapgrid_cp = {{ slapgrid_cp }}
-slapproxy = {{ slapproxy }}
-supervisor = {{ supervisor }}
-supervisord_config = {{ supervisord_config }}
-runner_workdir = {{ runner_workdir }}
-runner_host = {{ ipv4 }}
-runner_port = {{ runner_port }}
-instance_monitoring_url = {{ instance_monitoring_url }}
-ipv4_address = {{ ipv4 }}
-ipv6_address = {{ ipv6 }}
-etc_dir = {{ etc_dir }}
-run_dir = {{ run_dir }}
-log_dir = {{ log_dir }}
-console = {{ console }}
-verbose = {{ verbose }}
-debug = {{ debug }}
-auto_deploy = {{ auto_deploy }}
-auto_deploy_instance = {{ auto_deploy_instance }}
-autorun = {{ autorun }}
-knowledge0_cfg = {{ knowledge0_file }}
+slapgrid_sr = {{ slaprunner['slapgrid_sr'] }}
+slapgrid_cp = {{ slaprunner['slapgrid_cp'] }}
+slapproxy = {{ slaprunner['slapproxy'] }}
+supervisor = {{ slaprunner['supervisor'] }}
+supervisord_config = {{ slaprunner['supervisord_config'] }}
+runner_workdir = {{ slaprunner['working-directory'] }}
+runner_host = {{ slaprunner['ipv4'] }}
+runner_port = {{ slaprunner['runner_port'] }}
+instance_monitoring_url = {{ slaprunner['instance-monitor-url'] }}
+ipv4_address = {{ slaprunner['ipv4'] }}
+ipv6_address = {{ slaprunner['ipv6'] }}
+etc_dir = {{ slaprunner['etc_dir'] }}
+run_dir = {{ slaprunner['run_dir'] }}
+log_dir = {{ slaprunner['log_dir'] }}
+console = {{ slaprunner['console'] }}
+verbose = {{ slaprunner['verbose'] }}
+debug = {{ slaprunner['debug'] }}
+auto_deploy = {{ slaprunner['auto_deploy'] }}
+auto_deploy_instance = {{ slaprunner['auto_deploy_instance'] }}
+autorun = {{ slaprunner['autorun'] }}
+knowledge0_cfg = {{ slaprunner['knowledge0_file'] }}
 
 [slapproxy]
-host = {{ proxy_host }}
-port = {{ proxy_port }}
-database_uri = {{ proxy_database }}
+host = {{ slaprunner['ipv4'] }}
+port = {{ slaprunner['proxy_port'] }}
+database_uri = {{ slaprunner['proxy_database'] }}
 
 [sshkeys_authority]
-ssh_client = {{ ssh_client }}
-public_key = {{ public_key }}
-private_key = {{ private_key }}
+ssh_client = {{ slaprunner['ssh_client'] }}
+public_key = {{ slaprunner['public_key'] }}
+private_key = {{ slaprunner['private_key'] }}
 
 [gitclient]
-git = {{ git }}
+git = {{ slaprunner['git-binary'] }}
 
 [cloud9_IDE]