Disable curl progress bar when running vagrant up

This commit is contained in:
Michal Fojtik 2014-08-01 15:07:05 +02:00
parent 241ab692f6
commit 264eebb997
2 changed files with 2 additions and 2 deletions

View File

@ -59,7 +59,7 @@ EOF
# 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
curl -sS -L https://raw.githubusercontent.com/saltstack/salt-bootstrap/v2014.06.30/bootstrap-salt.sh | sh -s -- -M
mkdir -p /srv/salt/nginx
echo $MASTER_HTPASSWD > /srv/salt/nginx/htpasswd

View File

@ -45,7 +45,7 @@ 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 -sS -L http://bootstrap.saltstack.com | sh -s -- -X
## TODO this only works on systemd distros, need to find a work-around as removing -X above fails to start the services installed
systemctl enable salt-minion