From bb2df13bfdfffb8a05f7887d0a6f71691bf2eadf Mon Sep 17 00:00:00 2001
From: Leo Franchi <leo@humbughq.com>
Date: Tue, 23 Jul 2013 12:12:52 -0400
Subject: [PATCH] Unset -e flag during humbug.pem login to preserve idempotency
 of install-server

(imported from commit d65b635a48ce33908b2888319a7c109d5d126b54)
---
 servers/install-server | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/servers/install-server b/servers/install-server
index 055f8a04a8..0cd54b578f 100755
--- a/servers/install-server
+++ b/servers/install-server
@@ -32,6 +32,8 @@ fi
 # we'll get key errors after puppet apply.
 SSH_OPTS="-o HostKeyAlgorithms=ssh-rsa"
 
+set +e
+
 ssh $SSH_OPTS "$server" -t -i "$amazon_key_file" -ladmin <<EOF
 sudo sed -i 's/PermitRootLogin no/PermitRootLogin yes/g' /etc/ssh/sshd_config
 sudo mkdir ~root/.ssh && sudo cp .ssh/authorized_keys ~root/.ssh/authorized_keys
@@ -39,6 +41,8 @@ sudo service ssh restart
 
 EOF
 
+set -e
+
 ssh $SSH_OPTS "$server" -t -i "$amazon_key_file" -lroot <<EOF
 echo "$hostname" > /etc/hostname
 sed -i 's/localhost$/localhost $hostname/' /etc/hosts