summaryrefslogtreecommitdiffstats
path: root/mcp
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2017-12-18 08:38:21 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-12-18 08:38:21 +0000
commit9608e9e7716a8053e2f50b2296663f44db305d2e (patch)
tree20a0537ff1e5b988a4f69b9973fa6efc39acd949 /mcp
parent25536c1e20bdde947b387830556e1d4c95590f99 (diff)
parent4509936347b429fb36a27844a63d808f057fd61e (diff)
Merge "salt.sh: Use salt-call to apply linux sls on cfg01"
Diffstat (limited to 'mcp')
-rwxr-xr-xmcp/scripts/salt.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh
index 25eb0ede8..d687e3efa 100755
--- a/mcp/scripts/salt.sh
+++ b/mcp/scripts/salt.sh
@@ -97,7 +97,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