From bb0bc660cf407cd7001463ceda3095ab04ccab28 Mon Sep 17 00:00:00 2001 From: Ritesh H Shukla Date: Fri, 14 Oct 2016 21:42:04 +0000 Subject: [PATCH] Use fixed release for salt to avoid regression in release post 2016.3.2 --- cluster/vsphere/templates/salt-master.sh | 2 +- cluster/vsphere/templates/salt-minion.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cluster/vsphere/templates/salt-master.sh b/cluster/vsphere/templates/salt-master.sh index 82ea5a25890..871b715d280 100755 --- a/cluster/vsphere/templates/salt-master.sh +++ b/cluster/vsphere/templates/salt-master.sh @@ -70,5 +70,5 @@ EOF # # -M installs the master 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 diff --git a/cluster/vsphere/templates/salt-minion.sh b/cluster/vsphere/templates/salt-minion.sh index 7ccf9e6c0f1..2b4e40d725c 100755 --- a/cluster/vsphere/templates/salt-minion.sh +++ b/cluster/vsphere/templates/salt-minion.sh @@ -65,4 +65,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 -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