github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-24 19:38:02 +00:00
Code Issues Projects Releases Wiki Activity

Revert to latest salt bootstrap and force SSL

Browse Source
This commit is contained in:
derekwaynecarr
2014-08-18 11:39:23 -04:00
parent 053e75d8e9
commit 967c2552e7
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/vagrant/provision-minion.sh
View File

@@ -46,7 +46,7 @@ if [ ! $(which salt-minion) ]; then
#
# 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 -sS -L http://bootstrap.saltstack.com | sh -s -- -X
curl -sS -L --connect-timeout 20 --retry 6 --retry-delay 10 https://bootstrap.saltstack.com | sh -s -- -X
## TODO this only works on systemd distros, need to find a work-around as removing -X above fails to start the services installed
systemctl enable salt-minion