diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2017-12-20 16:27:58 +0400 |
|---|---|---|
| committer |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-12-31 01:18:01 +0100 |
| commit | b746366fcce6f23aae6f5719515111e85c36df1b (patch) | |
| tree | 5b5833d760cf7c1597d41d0c2ec46cfd75f02146 | |
| parent | ae331cdf3f4773ade96b1dc7d63e7d575288bbb1 (diff) | |
[maas] Adjust deployment order/timeouts
Change-Id: I9dbb51ce2387450e4ae19f8b3444f5e52cfdc71d
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry-picked from commit 52bd5a8f6c5b27ec3070625a51aea8ff85f5a8db)
| -rwxr-xr-x | mcp/config/states/maas | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/mcp/config/states/maas b/mcp/config/states/maas index bf2de28db..07718f8f1 100755 --- a/mcp/config/states/maas +++ b/mcp/config/states/maas @@ -19,7 +19,9 @@ function maas_fixup() { local statuscmd="salt 'mas01*' --out yaml state.apply maas.machines.status" local ncount=$(salt --out yaml 'mas01*' pillar.get maas:region:machines | \ grep -cE '^\s{2}\w+:$') - wait_for 30 "${statuscmd} | tee /dev/stderr | " \ + + # wait_for has 10sec timeout * 96 = 16 min > 15min for Failed state + wait_for 96 "${statuscmd} | tee /dev/stderr | " \ "grep -Eq '((Deployed|Ready): ${ncount}|status: (Failed|Allocated))'" local statusout=$(eval "${statuscmd}") @@ -74,13 +76,15 @@ salt -C 'cfg01*' state.apply maas.pxe_route wait_for 10 "salt -C 'mas01*' state.apply maas.region" salt -C 'mas01*' state.apply maas.machines -# MaaS node deployment -wait_for 20 maas_fixup # cleanup outdated salt keys +sleep 30 salt-key --out yaml | awk '!/^(minions|- cfg01|- mas01)/ {print $2}' | \ xargs -I{} salt-key -yd {} +# MaaS node deployment +wait_for 10 maas_fixup + salt -C 'mas01*' pillar.item\ maas:region:admin:username \ maas:region:admin:password |