From: Thilo Fromm <thilo.fromm@profitbricks.com>
Date: Thu, 25 Apr 2013 15:05:03 +0000 (+0200)
Subject: storage_deploy.sh: fix typo in cleanup, missing option
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=8d01479b8def290a1547d8393217c3105112d32c;p=profitbricks%2Fjenkins-build-scripts.git

storage_deploy.sh: fix typo in cleanup, missing option

Signed-off-by: Thilo Fromm <thilo.fromm@profitbricks.com>
---

diff --git a/storage_deploy.sh b/storage_deploy.sh
index d4c7309..44637ae 100755
--- a/storage_deploy.sh
+++ b/storage_deploy.sh
@@ -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."