aboutsummaryrefslogtreecommitdiffstats
path: root/mcp
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-10-19 21:39:33 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-10-19 21:39:33 +0000
commit8cd105aefb88b4a57dd27019ff37bf19cee9c4d9 (patch)
tree63607ed23384d0e3b50c2d0b04a2a4f222ec00f4 /mcp
parent58948f3d22c09959708a5fa371972ef3b3916335 (diff)
parentc017f076c0bd21a3752bee474c61828d1d6910a6 (diff)
Merge "[baremetal] Remove infinite loops from node checks" into stable/euphrates
Diffstat (limited to 'mcp')
-rwxr-xr-xmcp/config/states/maas10
-rwxr-xr-xmcp/config/states/virtual_control_plane5
2 files changed, 10 insertions, 5 deletions
diff --git a/mcp/config/states/maas b/mcp/config/states/maas
index 2a0f25be7..070045165 100755
--- a/mcp/config/states/maas
+++ b/mcp/config/states/maas
@@ -78,17 +78,19 @@ salt -C 'mas01*' pillar.item\
maas:region:admin:username \
maas:region:admin:password
-bm_nodes=$(salt --out yaml 'mas01*' pillar.get maas:region:machines | \
- awk '/^\s+\w+[[:digit:]]+:$/ {gsub(/:$/, "*"); print $1}')
-
# Check all baremetal nodes are available
rc=1
-while [ $rc -ne 0 ]; do
+attempt=0
+total_attempts=10
+while [ $rc -ne 0 ] && [ ${attempt} -lt ${total_attempts} ]; do
+ bm_nodes=$(salt --out yaml 'mas01*' pillar.get maas:region:machines | \
+ awk '/^\s+\w+[[:digit:]]+:$/ {gsub(/:$/, "*"); print $1}')
rc=0
for node in $bm_nodes; do
salt "$node" test.ping 2>/dev/null || { rc=$?; break; };
done
sleep 5
+ ((attempt+=1))
done
wait_for 10 "salt -C '* and not cfg01* and not mas01*' saltutil.sync_all"
diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane
index 0c3ef59f4..25b036ba9 100755
--- a/mcp/config/states/virtual_control_plane
+++ b/mcp/config/states/virtual_control_plane
@@ -35,12 +35,15 @@ vcp_nodes=$(salt --out yaml 'kvm01*' pillar.get salt:control:cluster:internal:no
# Check all vcp nodes are available
rc=1
-while [ $rc -ne 0 ]; do
+attempt=0
+total_attempts=10
+while [ $rc -ne 0 ] && [ ${attempt} -lt ${total_attempts} ]; do
rc=0
for node in $vcp_nodes; do
salt "$node" test.ping 2>/dev/null || { rc=$?; break; };
done
sleep 5
+ ((attempt+=1))
done
wait_for 10 "salt -C '* and not cfg01* and not mas01*' saltutil.sync_all"