Merge pull request #228 from shawnzhu/host-key

restore host keys for cluster environment as well

Author: rubiojr

bin/ghe-restore

@@ -287,6 +287,10 @@ if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
         ghe-ssh "$GHE_HOSTNAME" -- /bin/sh
 fi
 
+# restore host keys at last step before applying config changes
+echo "Restoring SSH host keys ..."
+ghe-ssh "$GHE_HOSTNAME" -- 'ghe-import-ssh-host-keys' < "$GHE_RESTORE_SNAPSHOT_PATH/ssh-host-keys.tar" 1>&3
+
 # When restoring to a host that has already been configured, kick off a
 # config run to perform data migrations.
 if $cluster; then
@@ -311,11 +315,6 @@ update_restore_status "complete"
 # Log restore complete message in /var/log/syslog on remote instance
 ghe_remote_logger "Completed restore from $(hostname) / snapshot ${GHE_RESTORE_SNAPSHOT}."
 
-if ! $cluster; then
-  echo "Restoring SSH host keys ..."
-  ghe-ssh "$GHE_HOSTNAME" -- 'ghe-import-ssh-host-keys' < "$GHE_RESTORE_SNAPSHOT_PATH/ssh-host-keys.tar" 1>&3
-fi
-
 echo "Completed restore of $GHE_HOSTNAME from snapshot $GHE_RESTORE_SNAPSHOT"
 
 if ! $cluster; then