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

Use curl exclusively in vSphere deployment

Browse Source 
This fixes #2295.
This commit is contained in:
Pieter Noordhuis
2014-11-11 16:12:16 -08:00
parent c8f64a28dd
commit 1df6f9ce6a
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/vsphere/templates/salt-master.sh
View File

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

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

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