From 1967580444defaa893bf608ea942689b1ad4ef7f Mon Sep 17 00:00:00 2001
From: Timothy Middelkoop <tmiddelkoop@internet2.edu>
Date: Fri, 11 Feb 2022 17:05:07 -0600
Subject: [PATCH] Azure: remote vm dev bugfixes

---
 scripts/azure-create.sh | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/scripts/azure-create.sh b/scripts/azure-create.sh
index 08fddeb..fa1e16a 100755
--- a/scripts/azure-create.sh
+++ b/scripts/azure-create.sh
@@ -37,6 +37,15 @@ az vm create --resource-group $RESOURCE_GROUP --name $VM \
 echo "+++ get IP for $VM"
 IP=$(az vm show --name $VM --resource-group $RESOURCE_GROUP -d --query publicIps -otsv)
 
+echo "+++ configure ~/.ssh/$VM.config"
+cat > ~/.ssh/$VM.config <<EOF
+Host essentials
+    HostName $IP
+    CheckHostIP=no
+    ForwardAgent=yes
+    User=$NAME
+EOF
+
 echo "+++ wait for boot and cloud-init ${VM} ${IP}"
 ssh-keygen -R "$IP"
 while ! ssh $NAME@$IP sudo cloud-init status --wait ; do
@@ -45,7 +54,7 @@ done
 
 echo "+++ configuring VM"
 ssh -A $NAME@$IP <<EOF
-echo '--- connected to $NAME@IP'
+echo '--- connected to $NAME@$IP'
 sudo apt-get update
 sudo apt-get install --yes azure-cli
 az login --identity
@@ -59,15 +68,6 @@ git config --global user.email "$(git config user.email)"
 git clone --branch $BRANCH $REPO
 EOF
 
-echo "+++ configure ~/.ssh/$VM.config"
-cat > ~/.ssh/$VM.config <<EOF
-Host essentials
-    HostName $IP
-    CheckHostIP=no
-    ForwardAgent=yes
-    User=$NAME
-EOF
-
 echo "+++ starting Jypter"
 ssh $NAME@$IP -t -L 8080:localhost:8080 -L 8081:localhost:8081 "cd $PROJECT ; ./scripts/jupyter-lab.sh"