diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2017-08-24 19:32:00 +0200 |
|---|---|---|
| committer |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-09-26 03:25:19 +0000 |
| commit | 79af1346fdd99e2186c45b2fd696d4ed6feb91cf (patch) | |
| tree | 0bb274765b6bb08cc4375ddb1197173a26ab125f /mcp | |
| parent | 53282e13c6c3937f5a3b9e91e72104252a38762f (diff) | |
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)
Diffstat (limited to 'mcp')
| -rwxr-xr-x | mcp/config/states/maas | 5 |
1 files changed, 4 insertions, 1 deletions
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}") |