From d4a9aef83e46acbba12eb40d323b39dadef43806 Mon Sep 17 00:00:00 2001 From: James DeFelice Date: Mon, 4 Aug 2014 12:07:17 -0400 Subject: [PATCH] add retries to salt bootstrap download --- cluster/templates/salt-master.sh | 2 +- cluster/templates/salt-minion.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cluster/templates/salt-master.sh b/cluster/templates/salt-master.sh index 7bc694287b8..e44f793663e 100755 --- a/cluster/templates/salt-master.sh +++ b/cluster/templates/salt-master.sh @@ -51,7 +51,7 @@ echo $MASTER_HTPASSWD > /srv/salt/nginx/htpasswd # # -M installs the master 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 echo $MASTER_HTPASSWD > /srv/salt/nginx/htpasswd diff --git a/cluster/templates/salt-minion.sh b/cluster/templates/salt-minion.sh index 08273e257b6..b8e07db1fbe 100755 --- a/cluster/templates/salt-minion.sh +++ b/cluster/templates/salt-minion.sh @@ -38,4 +38,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 http://bootstrap.saltstack.com | sh -s -- -X +curl -L --connect-timeout 20 --retry 6 --retry-delay 10 http://bootstrap.saltstack.com | sh -s -- -X