diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-12-18 04:39:01 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-12-31 01:15:39 +0100 |
| commit | f4b727ab3590be67acdb0e5a8405d91218870821 (patch) | |
| tree | c5d4f8aaa1a1085b2d7d61eca867332768a13c0b | |
| parent | bc7d5768e78e0197efbc08f289280dc39eb4f05e (diff) | |
salt.sh: Use salt-call to apply linux sls on cfg01
Also, retry applying linux high state up to twice, due to rare
spurious failures with 'No reponse' status.
Change-Id: Ic7839a5c9501673cb127412136afb91e05f87a7e
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commmit 4509936347b429fb36a27844a63d808f057fd61e)
| -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 f785fc745..bcd42bb14 100755 --- a/mcp/scripts/salt.sh +++ b/mcp/scripts/salt.sh @@ -90,7 +90,7 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s -e << SALT_INSTALL_END salt -C "${NODE_MASK} or cfg01*" state.apply salt | \ grep -Fq 'No response' && salt -C "${NODE_MASK} or cfg01*" state.apply salt - salt -C 'I@salt:master' state.sls linux + salt-call state.sls linux || salt-call state.sls linux salt -C "${NODE_MASK} and not cfg01*" state.sls linux || true salt -C "${NODE_MASK} and not cfg01*" pkg.upgrade refresh=False |