Code Review
/
fuel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
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
9ad0538
..
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+:$')
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 180 "${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}")
"grep -Eq '((Deployed|Ready): ${ncount}|status: (Failed|Allocated))'"
local statusout=$(eval "${statuscmd}")
@@
-28,7
+30,7
@@
function maas_fixup() {
for node_system_id in ${fcnodes}; do
salt -C 'mas01*' state.apply maas.machines.delete \
pillar="{'system_id': '${node_system_id}'}"
for node_system_id in ${fcnodes}; do
salt -C 'mas01*' state.apply maas.machines.delete \
pillar="{'system_id': '${node_system_id}'}"
- sleep
3
0
+ sleep
1
0
done
if [ -n "${fcnodes}" ]; then
salt -C 'mas01*' state.apply maas.machines
done
if [ -n "${fcnodes}" ]; then
salt -C 'mas01*' state.apply maas.machines
@@
-37,12
+39,14
@@
function maas_fixup() {
local fdnodes=$(echo "${statusout}" | \
grep -Pzo 'status: (Failed deployment|Allocated)\n\s+system_id: \K.+\n')
local fdnodes=$(echo "${statusout}" | \
grep -Pzo 'status: (Failed deployment|Allocated)\n\s+system_id: \K.+\n')
+ local rnodes=$(echo "${statusout}" | \
+ grep -Pzo 'status: Ready\n\s+system_id: \K.+\n')
for node_system_id in ${fdnodes}; do
salt -C 'mas01*' state.apply maas.machines.mark_broken_fixed \
pillar="{'system_id': '${node_system_id}'}"
for node_system_id in ${fdnodes}; do
salt -C 'mas01*' state.apply maas.machines.mark_broken_fixed \
pillar="{'system_id': '${node_system_id}'}"
- sleep
3
0
+ sleep
1
0
done
done
- if [ -n "${fdnodes}" ]; then
+ if [ -n "${fdnodes}" ]
|| [ -n "${rnodes}" ]
; then
salt -C 'mas01*' state.apply maas.machines.deploy
return 1
fi
salt -C 'mas01*' state.apply maas.machines.deploy
return 1
fi
@@
-64,22
+68,18
@@
fi
# MaaS rack/region controller, node commissioning
salt -C 'mas01*' state.apply linux,salt,openssh,ntp
# MaaS rack/region controller, node commissioning
salt -C 'mas01*' state.apply linux,salt,openssh,ntp
-salt -C 'mas01*' state.apply linux.network.interface
-salt -C 'mas01*' state.apply maas.pxe_nat
salt -C 'mas01*' state.apply maas.cluster
salt -C 'mas01*' state.apply maas.cluster
-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
wait_for 10 "salt -C 'mas01*' state.apply maas.region"
salt -C 'mas01*' state.apply maas.machines
-wait_for 10 maas_fixup
# cleanup outdated salt keys
# cleanup outdated salt keys
+sleep 30
salt-key --out yaml | awk '!/^(minions|- cfg01|- mas01)/ {print $2}' | \
xargs -I{} salt-key -yd {}
# MaaS node deployment
salt-key --out yaml | awk '!/^(minions|- cfg01|- mas01)/ {print $2}' | \
xargs -I{} salt-key -yd {}
# MaaS node deployment
-salt -C 'mas01*' state.apply maas.machines.deploy
wait_for 10 maas_fixup
salt -C 'mas01*' pillar.item\
wait_for 10 maas_fixup
salt -C 'mas01*' pillar.item\
@@
-101,4
+101,4
@@
while [ $rc -ne 0 ] && [ ${attempt} -lt ${total_attempts} ]; do
((attempt+=1))
done
((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"