Merge lp:~fginther/adt-cloud-worker/uci-nova-wait-for-active into lp:~canonical-ci-engineering/adt-cloud-worker/uci-nova

[Francis Ginther]

Wait for nova instance to become ACTIVE before searching for ipaddr.

Wait for nova instance to become ACTIVE before searching for ipaddr.

This solves the problem of other 'network' text in the "nova show" output tripping up the awk command searching for ipaddr.

https://trello.com/c/WA8HuriB/68-proposed-migration-uci-nova-can-get-tripped-up-when-looking-for-the-ip-address

[lp:~fginther/adt-cloud-worker/uci-nova-wait-for-active]

13. By Francis Ginther on 2015-04-21

Add a comment on why the ACTIVE check was added.

[Celso Providelo (cprov)]

Thanks for fixing this subtle problem, Francis.

review: Approve

=== modified file 'uci-nova'
--- uci-nova	2015-04-22 03:04:57 +0000
+++ uci-nova	2015-04-22 03:04:57 +0000
@@ -250,7 +250,11 @@
     retry=60
     while [ -z "$ipaddr" ]; do
         OUT=$(nova show --minimal $SRVNAME)
-        ipaddr=$(echo "$OUT" | awk 'BEGIN {FS="|"} /network/ {n=split($3,i,/,\s*/); gsub(" ", "", i[n]); print i[n]}')
+        # Check that the instance is in the 'ACTIVE' state before probing for
+        # the IP address to avoid awk'ing the wrong field
+        if $(echo "$OUT" | grep -q "ACTIVE"); then
+            ipaddr=$(echo "$OUT" | awk 'BEGIN {FS="|"} /network/ {n=split($3,i,/,\s*/); gsub(" ", "", i[n]); print i[n]}')
+        fi
         retry=$(( retry - 1 ))
         if [ $retry -le 0 ]; then
             error "Failed to acquire an IP address. Aborting!"