summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-09-25 17:10:52 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-09-25 17:10:52 +0000
commit6e3f9c49cf5da481831e5aa51eb5ce7a008186f4 (patch)
tree71eaf8114d0763c569ac28975e5c366ef037eaa5
parent45720d1905fd64105e054fa7c898e7d7369897cc (diff)
parented3404128c71d145ed2c697b6b15ea6d016c7550 (diff)
Merge "states: maas: Dynamic node count in stop condition"
-rwxr-xr-xmcp/config/states/maas5
1 files changed, 4 insertions, 1 deletions
diff --git a/mcp/config/states/maas b/mcp/config/states/maas
index e184e9120..aa17e9d4d 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}")