summaryrefslogtreecommitdiffstats
path: root/mcp/config/states/virtual_control_plane
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-02-07 14:52:57 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-02-07 14:52:57 +0000
commite8b0ec175eb68c792c7da3d225214c8b1874f42d (patch)
tree6cbbf4181297a0bb05881de5700cc07407f6474f /mcp/config/states/virtual_control_plane
parent20dac8e3fd7e3a4161b0ee0ea4f5eb4833a99dda (diff)
parent1a0e8e7e86aa5884a678ba448c6eb09c00ecc032 (diff)
Merge "[states] maas, vcp: Use `wait_for` in online check"
Diffstat (limited to 'mcp/config/states/virtual_control_plane')
-rwxr-xr-xmcp/config/states/virtual_control_plane12
1 files changed, 1 insertions, 11 deletions
diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane
index 338c4470f..328a6416b 100755
--- a/mcp/config/states/virtual_control_plane
+++ b/mcp/config/states/virtual_control_plane
@@ -36,17 +36,7 @@ vcp_nodes=$(salt --out yaml 'kvm01*' pillar.get salt:control:cluster:internal:no
awk '/\s+\w+:$/ {gsub(/:$/, "*"); print $1}')
# Check all vcp nodes are available
-rc=1
-attempt=0
-total_attempts=50
-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 25.0 "for n in ${vcp_nodes}; do salt '${n}' test.ping 2>/dev/null; done"
wait_for 10.0 "salt -C '* and not cfg01* and not mas01*' saltutil.sync_all"