slaprunner: fix in publication of shellinabox password for resiliency

Conflicts: software/slaprunner/common.cfg

slaprunner: fix in publication of shellinabox password for resiliency
Conflicts: software/slaprunner/common.cfg
85212dae · Nicolas Wavrant · 614fab3f · 85212dae · 85212dae
Commit 85212dae authored Nov 11, 2013 by Nicolas Wavrant
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

software/slaprunner/common.cfg software/slaprunner/common.cfg +1 -1

software/slaprunner/instance-resilient.cfg.jinja2 software/slaprunner/instance-resilient.cfg.jinja2 +1 -1

No files found.
--- a/software/slaprunner/common.cfg
+++ b/software/slaprunner/common.cfg
@@ -112,7 +112,7 @@ mode = 0644
 [template-resilient]
 recipe = slapos.recipe.download
 url = ${:_profile_base_location_}/instance-resilient.cfg.jinja2
-md5sum = ed9040fe86e54c7b39baa3084c03bcd2
+md5sum = b487329292b035e1b1b19ac2dc72f690
 filename = instance-resilient.cfg.jinja2
 mode = 0644


--- a/software/slaprunner/instance-resilient.cfg.jinja2
+++ b/software/slaprunner/instance-resilient.cfg.jinja2
@@ -28,7 +28,7 @@ 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}
-shell_password = ${request-runner:shell_password}
+shell_password = ${request-runner:connection-shell_password}

 [slap-parameter]
 # Default parameters for distributed deployment