github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #667 from brendandburns/debian

Browse Source 
Disable early error exit, since the salt script is broken for now.
This commit is contained in:
brendandburns 2014-07-28 14:02:06 -07:00
commit fd35c28ef4
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,6 +50,8 @@ echo $MASTER_HTPASSWD > /srv/salt/nginx/htpasswd
# install. See https://github.com/saltstack/salt-bootstrap/issues/270 # install. See https://github.com/saltstack/salt-bootstrap/issues/270
# #
# -M installs the master # -M installs the master
set +x
curl -L http://bootstrap.saltstack.com | sh -s -- -M -X curl -L http://bootstrap.saltstack.com | sh -s -- -M -X
set -x
echo $MASTER_HTPASSWD > /srv/salt/nginx/htpasswd echo $MASTER_HTPASSWD > /srv/salt/nginx/htpasswd