diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-10-14 19:18:51 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-10-14 18:24:27 +0000 |
| commit | cfd0fcc90fa3a3c67289ca4fba26e725f317e4c2 (patch) | |
| tree | 083b389c3868aae62fd63205dcb6d940d199f7ea /mcp/config/states/dpdk | |
| parent | ea64dc22ea171d45ae60aff682fcadf9d525889b (diff) | |
Drop infinite loops in favor of finite wait_for
While at it, fix some shellcheck warnings, and s/fgrep/grep -F/g.
Change-Id: I093b7b4c196731b1ecc0c27a4111955b2e412762
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 089585ad5370109d4c2a476b94b0017153d7713d)
Diffstat (limited to 'mcp/config/states/dpdk')
| -rwxr-xr-x | mcp/config/states/dpdk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mcp/config/states/dpdk b/mcp/config/states/dpdk index 9eba5c083..7cee70a88 100755 --- a/mcp/config/states/dpdk +++ b/mcp/config/states/dpdk @@ -1,8 +1,12 @@ #!/bin/bash set -x +# shellcheck disable=SC1090 +source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/lib.sh" + salt -I 'nova:compute' system.reboot -while true; do salt -I 'nova:compute' test.ping | grep -Fq 'Not connected' || break; done +wait_for 90 "! salt -I 'nova:compute' test.ping | " \ + "tee /dev/stderr | grep -Fq 'Not connected'" salt -I 'nova:compute' state.sls linux.network # switch to UCA repos since fuel-infra packages have bugs |