github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 13:45:06 +00:00
Code Issues Projects Releases Wiki Activity

Use fixed release for salt to avoid regression in release post 2016.3.2

Browse Source
This commit is contained in:
Ritesh H Shukla
2016-10-14 21:42:04 +00:00
parent 4a13431af3
commit bb0bc660cf
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -70,5 +70,5 @@ EOF
# #
# -M installs the master # -M installs the master
set +x set +x
curl -L --connect-timeout 20 --retry 6 --retry-delay 10 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 stable 2016.3.2
set -x set -x

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

@@ -65,4 +65,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 --connect-timeout 20 --retry 6 --retry-delay 10 https://bootstrap.saltstack.com | sh -s -- -X curl -L --connect-timeout 20 --retry 6 --retry-delay 10 https://bootstrap.saltstack.com | sh -s -- -X stable 2016.3.2