github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #762 from jdef/master

Browse Source 
add retries to salt bootstrap download
This commit is contained in:
brendandburns 2014-08-04 11:55:00 -07:00
commit a06d6726d4
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/templates/salt-master.sh
View File

@ -51,7 +51,7 @@ echo $MASTER_HTPASSWD > /srv/salt/nginx/htpasswd
# #
# -M installs the master # -M installs the master
set +x set +x
curl -L http://bootstrap.saltstack.com | sh -s -- -M -X curl -L --connect-timeout 20 --retry 6 --retry-delay 10 http://bootstrap.saltstack.com | sh -s -- -M -X
set -x set -x
echo $MASTER_HTPASSWD > /srv/salt/nginx/htpasswd echo $MASTER_HTPASSWD > /srv/salt/nginx/htpasswd

2
cluster/templates/salt-minion.sh
View File

@ -38,4 +38,4 @@ EOF
# #
# We specify -X to avoid a race condition that can cause minion failure to # We specify -X to avoid a race condition that can cause minion failure to
# install. See https://github.com/saltstack/salt-bootstrap/issues/270 # install. See https://github.com/saltstack/salt-bootstrap/issues/270
curl -L http://bootstrap.saltstack.com | sh -s -- -X curl -L --connect-timeout 20 --retry 6 --retry-delay 10 http://bootstrap.saltstack.com | sh -s -- -X