slaprunner: address of default instance monitoring sent with slapos.cfg

Conflicts:
	software/slaprunner/instance-runner.cfg

software/slaprunner/instance-runner.cfg

@@ -148,6 +148,8 @@ working-directory = $${runnerdirectory:home}
 project-directory = $${runnerdirectory:project}
 software-directory = $${runnerdirectory:software-root}
 instance-directory = $${runnerdirectory:instance-root}
+#XXX-Nico hardcoded default port because overridden by this buildout config
+instance-monitor-url = https://[$${:ipv6}]:9685
 etc_dir = $${directory:etc}
 log_dir =  $${directory:log}
 run_dir = $${directory:run}
@@ -486,6 +488,8 @@ context =
   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
   key log_dir slaprunner:log_dir

software/slaprunner/template/slapos.cfg.in

@@ -17,6 +17,7 @@ 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 }}