From f4b727ab3590be67acdb0e5a8405d91218870821 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Mon, 18 Dec 2017 04:39:01 +0100 Subject: 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 (cherry picked from commmit 4509936347b429fb36a27844a63d808f057fd61e) --- mcp/scripts/salt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mcp/scripts/salt.sh') 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 -- cgit 1.2.3-korg