states: maas: Dynamic node count in stop condition

Change-Id: I7fe8d0c77a1d62e2214fb1089651a639303dd20e
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit ed3404128c71d145ed2c697b6b15ea6d016c7550)

diff --git a/mcp/config/states/maas b/mcp/config/states/maas
index de9d699..2a0f948 100755 (executable)
--- a/mcp/config/states/maas
+++ b/mcp/config/states/maas
@@ -17,8 +17,11 @@ function wait_for() {
 # Wait for MaaS commissioning/deploy to finish, retry on failure
 function maas_fixup() {
   local statuscmd="salt 'mas01*' --out yaml state.apply maas.machines.status"
+  # shellcheck disable=SC2155
+  local ncount=$(salt --out yaml 'mas01*' pillar.get maas:region:machines | \
+    grep -cE '^\s{2}\w+:$')
   wait_for 180 "${statuscmd} | tee /dev/stderr | " \
-           "grep -Eq '((Deployed|Ready): 5|status:Failed|status:Allocated)'"
+    "grep -Eq '((Deployed|Ready): ${ncount}|status:Failed|status:Allocated)'"
   # shellcheck disable=SC2155
   local statusout=$(eval "${statuscmd}")