From 79af1346fdd99e2186c45b2fd696d4ed6feb91cf Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Thu, 24 Aug 2017 19:32:00 +0200 Subject: states: maas: Dynamic node count in stop condition Change-Id: I7fe8d0c77a1d62e2214fb1089651a639303dd20e Signed-off-by: Alexandru Avadanii Signed-off-by: Michael Polenchuk (cherry picked from commit ed3404128c71d145ed2c697b6b15ea6d016c7550) --- mcp/config/states/maas | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'mcp/config/states/maas') diff --git a/mcp/config/states/maas b/mcp/config/states/maas index de9d699b9..2a0f94809 100755 --- 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}") -- cgit 1.2.3-korg