summaryrefslogtreecommitdiffstats
path: root/mcp/scripts
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-10-14 19:18:51 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-10-14 18:24:27 +0000
commitcfd0fcc90fa3a3c67289ca4fba26e725f317e4c2 (patch)
tree083b389c3868aae62fd63205dcb6d940d199f7ea /mcp/scripts
parentea64dc22ea171d45ae60aff682fcadf9d525889b (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')
-rw-r--r--mcp/scripts/lib.sh5
-rwxr-xr-xmcp/scripts/salt.sh2
2 files changed, 3 insertions, 4 deletions
diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh
index 748c6dde1..3a6deec21 100644
--- a/mcp/scripts/lib.sh
+++ b/mcp/scripts/lib.sh
@@ -144,13 +144,13 @@ function start_vms {
function check_connection {
local total_attempts=60
local sleep_time=5
- local attempt=1
set +e
echo '[INFO] Attempting to get into Salt master ...'
# wait until ssh on Salt master is available
- while ((attempt <= total_attempts)); do
+ # shellcheck disable=SC2034
+ for attempt in $(seq "${total_attempts}"); do
# shellcheck disable=SC2086
ssh ${SSH_OPTS} "ubuntu@${SALT_MASTER}" uptime
case $? in
@@ -158,7 +158,6 @@ function check_connection {
*) echo "${attempt}/${total_attempts}> ssh server ain't ready yet, waiting for ${sleep_time} seconds ..." ;;
esac
sleep $sleep_time
- ((attempt+=1))
done
set -e
}
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