From: Thilo Fromm <thilo.fromm@profitbricks.com>
Date: Thu, 25 Apr 2013 14:57:58 +0000 (+0200)
Subject: storage_deploy.sh: remove key from storage after deploy
X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=63a14a0e8b640f27afee2bd2ad822ce6d826a7f8;p=profitbricks%2Fjenkins-build-scripts.git

storage_deploy.sh: remove key from storage after deploy

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

diff --git a/storage_deploy.sh b/storage_deploy.sh
index 0c1d168..d4c7309 100755
--- a/storage_deploy.sh
+++ b/storage_deploy.sh
@@ -18,6 +18,19 @@ prepare() {
 }
 # ----
 
+cleanup() {
+    local srv="$1"
+
+    # remove installer key from list of root authorized keys
+    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 0
+
+}
+# ----
 
 rexec() {
     local srv="$1" ; shift
@@ -166,6 +179,8 @@ main() {
     rexec "$storage_ip" "reboot" ||  return 1
     wait_for_reboot 600 $storage_ip || { log "    ABORT"; return 1; }
 
+    cleanup || return 1
+
     log "                     S U C C E S S"
     log "   Your storage server is now available at $storage_ip."
 }