Change output order

Author: MaxBed4d

.github/actions/aufn-test/run.sh

@@ -22,8 +22,8 @@ function check_lab_vm_connections() {
   echo "Checking VM connections..."
   cat ssh_list.txt
   while IFS= read -r line; do
-    ip=$(echo "$line" | awk '{print $2}')
-    name=$(echo "$line" | awk '{print $3}')
+    ip=$(echo "$line" | awk '{print $3}')
+    name=$(echo "$line" | awk '{print $2}')
     password=$(echo "$line" | awk '{print $5}')
 
     echo "Connecting to $name ($password) at $ip ..."
@@ -38,8 +38,8 @@ function validate_lab_vms() {
   rm -f failed-labs.txt
 
   while IFS= read -r line; do
-    ip=$(echo "$line" | awk '{print $2}')
-    name=$(echo "$line" | awk '{print $3}')
+    ip=$(echo "$line" | awk '{print $3}')
+    name=$(echo "$line" | awk '{print $2}')
     password=$(echo "$line" | awk '{print $5}')
 
     echo "Validating $name at $ip..."
@@ -102,8 +102,8 @@ function taint_and_reapply() {
 #   mapfile -t ssh_lines < ssh_list.txt
 #   for i in "${!ssh_lines[@]}"; do
 #     line="${ssh_lines[$i]}"
-#     ip=$(echo "$line" | awk '{print $2}')
-#     name=$(echo "$line" | awk '{print $3}')
+#     ip=$(echo "$line" | awk '{print $3}')
+#     name=$(echo "$line" | awk '{print $2}')
 #     password=$(echo "$line" | awk '{print $5}')
 
 #     sshpass -p "$password" ssh -o StrictHostKeyChecking=no \
@@ -116,8 +116,8 @@ function run_universe_from_seed() {
   if [[ "$AU_FROM_SEED" != "true" ]]; then return; fi
   echo "Launching a-universe-from-seed..."
   while IFS= read -r line; do
-    ip=$(echo "$line" | awk '{print $2}')
-    name=$(echo "$line" | awk '{print $3}')
+    ip=$(echo "$line" | awk '{print $3}')
+    name=$(echo "$line" | awk '{print $2}')
     password=$(echo "$line" | awk '{print $5}')
 
     sshpass -p "$password" ssh -o StrictHostKeyChecking=no \

.github/workflows/deploy-aufn.yml

@@ -17,7 +17,7 @@ on:
         description: Total number of Lab VMs to deploy
         type: number
         required: true
-        default: 1
+        default: 2
       bas_pwd: # When using in workflow use ::add-mask::$ to mask the password
         description: Password for bastion access
         type: string

output.tf

@@ -1,5 +1,5 @@
 output "labs" {
-  value = join("\n", formatlist("ssh %s %s # %s #", openstack_compute_instance_v2.lab.*.access_ip_v4, openstack_compute_instance_v2.lab.*.name, openstack_compute_instance_v2.lab.*.id))
+  value = join("\n", formatlist("ssh %s %s # %s #", openstack_compute_instance_v2.lab.*.name, openstack_compute_instance_v2.lab.*.access_ip_v4, openstack_compute_instance_v2.lab.*.id))
 }
 
 output "registry" {