]> Frank Brehm's Git Trees - profitbricks/jenkins-build-scripts.git/commitdiff
storage_deploy.sh: fix typo in cleanup, missing option
authorThilo Fromm <thilo.fromm@profitbricks.com>
Thu, 25 Apr 2013 15:05:03 +0000 (17:05 +0200)
committerThilo Fromm <thilo.fromm@profitbricks.com>
Thu, 25 Apr 2013 15:05:03 +0000 (17:05 +0200)
Signed-off-by: Thilo Fromm <thilo.fromm@profitbricks.com>
storage_deploy.sh

index d4c73092da84ae2c290dc5c9cf2a29604c162e5b..44637ae10d3b10963f99cca9ad750d6535e25800 100755 (executable)
@@ -25,7 +25,7 @@ cleanup() {
     rexec "$srv" "sed 's/.*\ storageautoinstaller@host/# ...key removed by auto-deploy script./' /root/.ssh/authorized_keys" \
         || { log "    ERROR removing installer ssh key from storage server $srv."
              log "    #######  MANUAL ATTENTION REQUIRED #######"
-             return 1}
+             return 1}
 
     return 0
 
@@ -179,7 +179,7 @@ main() {
     rexec "$storage_ip" "reboot" ||  return 1
     wait_for_reboot 600 $storage_ip || { log "    ABORT"; return 1; }
 
-    cleanup || return 1
+    cleanup "$storage_ip" || return 1
 
     log "                     S U C C E S S"
     log "   Your storage server is now available at $storage_ip."