From 8f69f49f8b133431dfc68a6366b45cca849a08e6 Mon Sep 17 00:00:00 2001
From: Anmol Sethi <anmol@terrastruct.com>
Date: Sun, 18 Dec 2022 19:44:35 -0800
Subject: [PATCH] ci/aws: Use ssh-keygen in better spot

---
 ci/release/aws/ensure.sh | 4 ++--
 ci/sub                   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ci/release/aws/ensure.sh b/ci/release/aws/ensure.sh
index 4c4020da5..5f68e45b3 100755
--- a/ci/release/aws/ensure.sh
+++ b/ci/release/aws/ensure.sh
@@ -267,6 +267,7 @@ wait_remote_host_ip() {
       ip=$(sh_c aws ec2 describe-instances \
         --filters 'Name=instance-state-name,Values=pending,running,stopping,stopped' "Name=tag:Name,Values=$REMOTE_NAME" \
         | jq -r '.Reservations[].Instances[].PublicIpAddress')
+      ssh-keygen -R "$ip"
       break
     fi
     sleep 5
@@ -391,7 +392,6 @@ init_remote_env() {
 }
 
 wait_remote_host() {
-  ssh-keygen -R "${REMOTE_HOST##*@}"
   while true; do
     if sh_c ssh "$REMOTE_HOST" true; then
       break
@@ -538,7 +538,7 @@ EOF
   printf '%s\n' "$gen_init_ps1" >&2
   warn '4. Run the following to be notified once installation is successful:'
   cat <<EOF
-  ssh-keygen -R ${REMOTE_HOST##*@} && until ssh $REMOTE_HOST d2 --version; do echo 'failed: retrying in 5s' && sleep 5; done && printf 'success\a\n'
+  until ssh $REMOTE_HOST d2 --version; do echo 'failed: retrying in 5s' && sleep 5; done && printf 'success\a\n'
 EOF
 }
 
diff --git a/ci/sub b/ci/sub
index 8c1b0bba1..2db232e4a 160000
--- a/ci/sub
+++ b/ci/sub
@@ -1 +1 @@
-Subproject commit 8c1b0bba1d2539a11fc2b3f4fcf054d1d71f05a5
+Subproject commit 2db232e4aa5225e22f95ff91914f91b59fe48d07