diff --git a/software/slaprunner/instance-resilient.cfg.jinja2 b/software/slaprunner/instance-resilient.cfg.jinja2 index 4cd5511364872211ec3ee5b7b69f3816f30136cc..bb7f9c9197565305abafbd860151f10d046310e1 100644 --- a/software/slaprunner/instance-resilient.cfg.jinja2 +++ b/software/slaprunner/instance-resilient.cfg.jinja2 @@ -17,7 +17,7 @@ parts += # Bubble up the parameters [request-runner] -return = url ssh-public-key ssh-url notification-id ip backend_url url cloud9_url ssh_command password_recovery_code +return = url ssh-public-key ssh-url notification-id ip backend_url url cloud9_url ssh_command password_recovery_code cloud9_backend_url config = instance-amount debug domain number authorized-key notify ip-list namebase runner1-computer-guid pbs-runner1-computer-guid runner2-computer-guid pbs-runner2-computer-guid runner3-computer-guid pbs-runner3-computer-guid # XXX Cedric LN Ugly hack, resilient stack and slaprunner stack sharing too much ssh sections config-authorized-key = ${request-pbs-runner-1:connection-ssh-key} ${request-pbs-runner-2:connection-ssh-key} ${slap-parameter:authorized-key} @@ -38,6 +38,7 @@ recipe = slapos.cookbook:publish backend_url = ${request-runner:connection-backend_url} url = ${request-runner:connection-url} cloud9_url = ${request-runner:connection-cloud9_url} +cloud9_backend_url = ${request-runner:connection-cloud9_backend_url} ssh_command = ${request-runner:connection-ssh_command} password_recovery_code = ${request-runner:connection-password_recovery_code} diff --git a/software/slaprunner/instance-runner-export.cfg.in b/software/slaprunner/instance-runner-export.cfg.in index 811c10076179cdfbe191ff159e67dba3ae19eb27..6a016dc83f7c1fba2f8d8ccab312afde411e19cb 100644 --- a/software/slaprunner/instance-runner-export.cfg.in +++ b/software/slaprunner/instance-runner-export.cfg.in @@ -3,13 +3,26 @@ extends = ${template-runner:output} ${pbsready-export:output} parts += - urls - certificate-authority - ca-nginx - nginx_conf - nginx-launcher - slaprunner - cron-entry-backup + nginx_conf + nginx-launcher + cloud9 + certificate-authority + ca-nginx + ca-node-frontend + slaprunner + test-runner + sshkeys-dropbear-runner + dropbear-server-add-authorized-key + sshkeys-authority + slaprunner-promise + slaprunner-frontend-promise + cloud9-promise + dropbear-promise + symlinks + node-frontend-promise + nginx-promise + urls + cron-entry-backup [exporter] recipe = slapos.cookbook:slaprunner.export @@ -25,7 +38,8 @@ rsync-binary = ${rsync:location}/bin/rsync [urls] <= resilient-publish-connection-parameter backend_url = $${slaprunner:access-url} -url = $${request-frontend:connection-site_url} -cloud9_url = https://[$${nginx-frontend:ip}]:$${nginx-frontend:port} +url = https://$${request-frontend:connection-domain} +cloud9_backend_url = $${node-frontend:access-url} +cloud9_url = https://$${request-cloud9-frontend:connection-domain} ssh_command = ssh $${dropbear-runner-server:host} -p $${dropbear-runner-server:port} password_recovery_code = $${recovery-code:passwd} diff --git a/software/slaprunner/instance-runner-import.cfg.in b/software/slaprunner/instance-runner-import.cfg.in index bc27c241b0fd2b7f318311eadd4a3872547b88bf..2886b79ee8a8337c0424a32be1ff8eabd5ac8149 100644 --- a/software/slaprunner/instance-runner-import.cfg.in +++ b/software/slaprunner/instance-runner-import.cfg.in @@ -3,13 +3,26 @@ extends = ${template-runner:output} ${pbsready-import:output} parts += - certificate-authority - ca-nginx - nginx_conf - nginx-launcher - slaprunner + nginx_conf + nginx-launcher + cloud9 + certificate-authority + ca-nginx + ca-node-frontend + slaprunner + test-runner + sshkeys-dropbear-runner + dropbear-server-add-authorized-key + sshkeys-authority + slaprunner-promise + cloud9-promise + dropbear-promise + symlinks + nginx-promise + urls + cron-entry-backup # have to repeat the next one, as it's not inherited from pbsready-import - import-on-notification + import-on-notification [importer] recipe = slapos.cookbook:slaprunner.import