github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Install specific salt version on AWS, based on GCE

Browse Source 
The latest salt version breaks the container_bridge.py _state function

We can lock to the same version as GCE.  This is not a full fix,
because we can't update to the latest salt without breaking GCE,
but this at least unbreaks and sync AWS with GCE.

This isn't a straight copy from GCE, because we still use
the salt master on AWS (for now)

Fixes #8114
This commit is contained in:
Justin Santa Barbara
2015-05-12 14:46:17 -04:00
parent 2f2816368f
commit ffb0e7f9b8
4 changed files with 76 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cluster/aws/templates/salt-minion.sh
View File

@@ -55,9 +55,6 @@ if [[ -n "${DOCKER_ROOT}" ]]; then
EOF
fi
install-salt
# Install Salt
#
# We specify -X to avoid a race condition that can cause minion failure to
# install. See https://github.com/saltstack/salt-bootstrap/issues/270
curl -L --connect-timeout 20 --retry 6 --retry-delay 10 https://bootstrap.saltstack.com | sh -s -- -X
service salt-minion start