summaryrefslogtreecommitdiffstats
path: root/mcp
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2017-12-20 16:27:58 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2017-12-20 16:29:32 +0400
commit52bd5a8f6c5b27ec3070625a51aea8ff85f5a8db (patch)
treebd89ae732e8b79320f1a9b2aac3774f846662b5b /mcp
parent5ed31a007826052a723cb573f7ed49a7473699f6 (diff)
[maas] Adjust deployment order/timeouts
Change-Id: I9dbb51ce2387450e4ae19f8b3444f5e52cfdc71d Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp')
-rwxr-xr-xmcp/config/states/maas10
1 files changed, 7 insertions, 3 deletions
diff --git a/mcp/config/states/maas b/mcp/config/states/maas
index f472c0154..2062cbabb 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}")
@@ -72,13 +74,15 @@ salt -C 'mas01*' state.apply maas.cluster
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