github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #661 from csrwng/fix_salt_stack 

Temporarily point to older bootstrap script
pull/6/head
Clayton Coleman 2014-07-28 15:00:05 -04:00
parent 616398987a d9ae72d1f0
commit 37e5f96074
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cluster/vagrant/provision-master.sh
View File

@ -53,7 +53,13 @@ EOF
# 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
curl -L http://bootstrap.saltstack.com | sh -s -- -M # FIXME: The following line should be replaced with:
# curl -L http://bootstrap.saltstack.com | sh -s -- -M
# when the merged salt-api service is included in the fedora salt-master rpm
# Merge is here: https://github.com/saltstack/salt/pull/13554
# Fedora git repository is here: http://pkgs.fedoraproject.org/cgit/salt.git/
# (a new service file needs to be added for salt-api)
curl -L https://raw.githubusercontent.com/saltstack/salt-bootstrap/v2014.06.30/bootstrap-salt.sh | sh -s -- -M
mkdir -p /srv/salt/nginx mkdir -p /srv/salt/nginx
echo $MASTER_HTPASSWD > /srv/salt/nginx/htpasswd echo $MASTER_HTPASSWD > /srv/salt/nginx/htpasswd
@ -75,4 +81,4 @@ popd
echo "Executing configuration" echo "Executing configuration"
salt '*' mine.update salt '*' mine.update
salt --force-color '*' state.highstate salt --force-color '*' state.highstate