Merge pull request #44179 from mikedanese/saltsucks

Automatic merge from submit-queue make salt return non-zero exit code on failure Fixes https://github.com/kubernetes/kubernetes/issues/32478

Merge pull request #44179 from mikedanese/saltsucks
af341e3f · Kubernetes Submit Queue · GitHub · aa1bd2b3 · e2d7e2c8 · af341e3f
Commit af341e3f authored Apr 06, 2017 by Kubernetes Submit Queue Committed by GitHub Apr 06, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

configure-vm.sh cluster/gce/configure-vm.sh +1 -1

No files found.
--- a/cluster/gce/configure-vm.sh
+++ b/cluster/gce/configure-vm.sh
@@ -796,7 +796,7 @@ function run-salt() {
  echo "== Calling Salt =="
  local rc=0
  for i in {0..6}; do
-    salt-call --local state.highstate && rc=0 || rc=$?
+    salt-call --retcode-passthrough --local state.highstate && rc=0 || rc=$?
    if [[ "${rc}" == 0 ]]; then
      return 0
    fi