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/scripts/salt.sh | |
| 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/scripts/salt.sh')
| -rwxr-xr-x | mcp/scripts/salt.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh index 73190e315..df0ef70fb 100755 --- a/mcp/scripts/salt.sh +++ b/mcp/scripts/salt.sh @@ -59,7 +59,7 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s -e << SALT_INSTALL_END salt-call state.apply salt salt '*' saltutil.sync_all - salt '*' state.apply salt | fgrep -q 'No response' && salt '*' state.apply salt + salt '*' state.apply salt | grep -Fq 'No response' && salt '*' state.apply salt salt -C 'I@salt:master' state.sls linux salt -C '* and not cfg01*' state.sls linux |