From 1a0e8e7e86aa5884a678ba448c6eb09c00ecc032 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sun, 4 Feb 2018 06:47:26 +0100 Subject: [states] maas, vcp: Use `wait_for` in online check Change-Id: I7b583c354843f0116a65b3a31f3be4589087b8a5 Signed-off-by: Alexandru Avadanii --- mcp/config/states/virtual_control_plane | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'mcp/config/states/virtual_control_plane') 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" -- cgit 1.2.3-korg