Merge "[states] maas, vcp: Use `wait_for` in online check"

1 files changed, 7 insertions, 14 deletions

diff --git a/mcp/config/states/maas b/mcp/config/states/maas
index dcbdf98cc..8c9411923 100755
--- a/mcp/config/states/maas
+++ b/mcp/config/states/maas
@@ -14,6 +14,9 @@ ERASE_ENV=${ERASE_ENV:-0}
 source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/globals.sh"
 source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/lib.sh"
 
+bm_nodes=$(salt --out yaml 'mas01*' pillar.get maas:region:machines | \
+           awk '/^\s+\w+[[:digit:]]+:$/ {gsub(/:$/, "*"); print $1}')
+
 # Wait for MaaS commissioning/deploy to finish, retry on failure
 function maas_fixup() {
   local statuscmd="salt 'mas01*' --out yaml state.apply maas.machines.status"
@@ -72,7 +75,9 @@ salt -C 'mas01*' state.apply maas.cluster
 
 wait_for 10 "salt -C 'mas01*' state.apply maas.region"
 
-salt -C 'mas01*' state.apply maas.machines
+if [ -n "${bm_nodes[*]}" ]; then
+  salt -C 'mas01*' state.apply maas.machines
+fi
 
 # cleanup outdated salt keys
 sleep 30
@@ -87,18 +92,6 @@ salt -C 'mas01*' pillar.item\
   maas:region:admin:password
 
 # Check all baremetal nodes are available
-rc=1
-attempt=0
-total_attempts=10
-while [ $rc -ne 0 ] && [ ${attempt} -lt ${total_attempts} ]; do
-  bm_nodes=$(salt --out yaml 'mas01*' pillar.get maas:region:machines | \
-             awk '/^\s+\w+[[:digit:]]+:$/ {gsub(/:$/, "*"); print $1}')
-  rc=0
-  for node in $bm_nodes; do
-    salt "$node" test.ping 2>/dev/null || { rc=$?; break; };
-  done
-  sleep 5
-  ((attempt+=1))
-done
+wait_for 5.0 "for n in ${bm_nodes}; do salt '${n}' test.ping 2>/dev/null; done"
 
 wait_for 10.0 "salt -C '* and not cfg01* and not mas01*' saltutil.sync_all"