Merge "[baremetal] Fix cmp proto dhcp on PXE/admin"

[fuel.git] / mcp / config / states / maas

diff --git a/mcp/config/states/maas b/mcp/config/states/maas
index f472c01..8f7a866 100755 (executable)
--- 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}")
 
@@ -66,19 +68,20 @@ fi
 
 # MaaS rack/region controller, node commissioning
 salt -C 'mas01*' state.apply linux,salt,openssh,ntp
-salt -C 'mas01*' state.apply maas.pxe_nat
 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
@@ -98,4 +101,4 @@ while [ $rc -ne 0 ] && [ ${attempt} -lt ${total_attempts} ]; do
   ((attempt+=1))
 done
 
-wait_for 10 "salt -C '* and not cfg01* and not mas01*' saltutil.sync_all"
+wait_for 10.0 "salt -C '* and not cfg01* and not mas01*' saltutil.sync_all"