Merge ~kajiya/+git/next-demo:change-wording into ~kajiya/+git/next-demo:main

[Chloé Smith]

feat: Reword sentences around pro

Also
  * Pinned a slightly older image
  * (Re-)install ubuntu-advantage-tools on startup so it's up to date
    for the demo
  * Dropped all old-school SSH config
  * Added more steps to on-instance.sh

[Chloé Smith (kajiya)]

review: Abstain

[Chloé Smith (kajiya)]

review: Abstain

[Ankush Pathak (ankushpathak)]

Two cosmetic inline comments. But otherwise LGTM.

review: Approve

diff --git a/main.sh b/main.sh
index f1c099f..40d6620 100755
--- a/main.sh
+++ b/main.sh
@@ -2,12 +2,9 @@
 
 INSTANCE_NAME=focal-$(petname)
 ZONE="us-central1-a"
-IMAGE_NAME="ubuntu-2004-focal-v20231213"
+IMAGE_NAME="ubuntu-2004-focal-v20231130"
 PROJECT="${1}"
 
-PUB_KEYNAME=${INSTANCE_NAME}.rsa.pub
-PRIVATE_KEYNAME=${INSTANCE_NAME}.rsa
-
 lets_spin(){
   local pid=$!
   local spin='\|/-'
@@ -39,15 +36,13 @@ wait_instance_connectable() {
 
 launch_instance(){
 
-  touch ${INSTANCE_NAME}_hosts_file
-  ssh-keygen -t rsa -f ${INSTANCE_NAME}.rsa -C ubuntu -b 2048 -N ""
-
-  gcloud compute instances create ${INSTANCE_NAME} --machine-type n2d-standard-4 --project ${PROJECT} --image ${IMAGE_NAME} --image-project=ubuntu-os-cloud --zone ${ZONE} --metadata=ssh-keys=${PRIVATE_KEYNAME},startup-script='#! /bin/bash
+  printf "Launching a new instance...\n"
+  gcloud compute instances create ${INSTANCE_NAME} --machine-type n2d-standard-4 --project ${PROJECT} --image ${IMAGE_NAME} --image-project=ubuntu-os-cloud --zone ${ZONE}   --metadata=startup-script='#! /bin/bash
   apt update
-  apt -y install mongodb ros-base-python-dev
-  EOF'
+  apt -y install mongodb ros-base-python-dev ubuntu-advantage-tools
+  EOF' & lets_spin
 
-  echo "Waiting for instance to launch..."
+  echo "Waiting for instance to start..."
 
   wait_instance_connectable & lets_spin
 
@@ -60,8 +55,7 @@ launch_instance(){
   done
   gcloud compute ssh "ubuntu@${INSTANCE_NAME}" --command "cat instance-bashrc >> ~/.bashrc" --project ${PROJECT}  --zone ${ZONE}
   echo "SSH-ing into the instance..."
-
-  ssh ubuntu@$(gcloud compute instances describe ${INSTANCE_NAME} --zone ${ZONE} --format json | jq -r '.networkInterfaces[]  .accessConfigs[].natIP') -i ${PRIVATE_KEYNAME} -o "StrictHostKeyChecking no" -o UserKnownHostsFile=${INSTANCE_NAME}_hosts_file
+  gcloud compute ssh "ubuntu@${INSTANCE_NAME}" --project "${PROJECT}"  --zone "${ZONE}"
 
 }
 
@@ -74,12 +68,7 @@ while true; do
   then
     cowsay "Thank you!"
   fi
- 
-  echo "Now running cleanup..."
-  rm -rfv ${PUB_KEYNAME} 
-  rm -rfv ${PRIVATE_KEYNAME}
-  rm -rfv ${INSTANCE_NAME}_hosts_file
-  
+
   echo "Deleting the instance and starting over again!"
   gcloud compute instances delete ${INSTANCE_NAME} --project ${PROJECT} --zone ${ZONE} --quiet & lets_spin
 done
diff --git a/on-instance.sh b/on-instance.sh
index 8fdeb28..773fba8 100644
--- a/on-instance.sh
+++ b/on-instance.sh
@@ -4,8 +4,8 @@ set -e
 clear
 
 echo "=========================================================="
-echo "You are on an Ubuntu 20.04 instance in Google Cloud."
-echo "Why do you need Ubuntu Pro? Type 'pro security-status' and run the command to find out"
+printf "$ You are on an Ubuntu 20.04 (Focal Fossa) instance in Google Cloud.\n"
+printf "$ Find out how secure this instance is; type 'pro security-status' and run the command to find out!\n"
 read -r USER_INPUT
 while [ "${USER_INPUT}" != "pro security-status" ]; do
   echo "Ooops! Please try typing that again."
@@ -20,15 +20,27 @@ read -r
 TOKEN=$(cat token)
 sudo pro attach "${TOKEN}"
 read -r -p "Return to continue."
+clear
 echo "=========================================================="
 echo "Your instance is now a Pro too."
-echo "Let's look at the esm-apps installed..."
+echo "Let's look at the packages installed in detail."
+printf "\$ pro security-status --esm-apps"
+read -r
 pro security-status --esm-apps
+echo "Looks like there are security updates to install..."
+printf "\$ sudo apt upgrade -y"
+read -r
+sudo apt upgrade -y
+printf "\$ pro security-status --esm-apps"
+read -r
+pro security-status --esm-apps
+echo "=========================================================="
+echo "The system is now secure!"
 echo "=========================================================="
+printf "\n"
 echo "Go to ubuntu.com/pro to get your free token."
-read -r -p "Return to continue."
 echo "=========================================================="
-read -r -p "Would you like to switch to a bash session?(y/n)[n]" ANSWER
+read -r -p "Would you like to switch to a bash session on this instance?(y/n)[n]" ANSWER
 if [ "${ANSWER}" != "y" ];
 then
     exit