From 1530da00539d09a22bc79d7c1ba03f0c2e6575e3 Mon Sep 17 00:00:00 2001 From: Brendan Burns Date: Mon, 28 Jul 2014 13:32:00 -0700 Subject: [PATCH] Disable early error exit, since the salt script is broken for now. See: https://github.com/saltstack/salt-bootstrap/pull/436 --- cluster/templates/salt-master.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cluster/templates/salt-master.sh b/cluster/templates/salt-master.sh index d08bc3d99d4..7bc694287b8 100755 --- a/cluster/templates/salt-master.sh +++ b/cluster/templates/salt-master.sh @@ -50,6 +50,8 @@ echo $MASTER_HTPASSWD > /srv/salt/nginx/htpasswd # install. See https://github.com/saltstack/salt-bootstrap/issues/270 # # -M installs the master +set +x curl -L http://bootstrap.saltstack.com | sh -s -- -M -X +set -x echo $MASTER_HTPASSWD > /srv/salt/nginx/htpasswd