haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

privisoners/salt: proper bootstrap URL [GH-3583]

This commit is contained in:
Mitchell Hashimoto 2014-04-30 15:32:20 -07:00
parent ac95cb5785
commit f80fdfa32a
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -65,6 +65,7 @@ BUG FIXES:
- provisioners/salt: Always copy keys and configs on provision. [GH-3536] - provisioners/salt: Always copy keys and configs on provision. [GH-3536]
- provisioners/salt: Install args should always be present with bootstrap. - provisioners/salt: Install args should always be present with bootstrap.
- provisioners/salt: Overwrite keys properly on subsequent provisions [GH-3575] - provisioners/salt: Overwrite keys properly on subsequent provisions [GH-3575]
- provisioners/salt: Bootstrap uses raw GitHub URL rather than subdomain. [GH-3583]
- synced\_folders/nfs: Acquires a process-level lock so exports don't - synced\_folders/nfs: Acquires a process-level lock so exports don't
collide with Vagrant running in parallel. collide with Vagrant running in parallel.
- synced\_folders/rsync: Add UserKnownHostsFile option to not complain. [GH-3511] - synced\_folders/rsync: Add UserKnownHostsFile option to not complain. [GH-3511]

6
plugins/provisioners/salt/bootstrap-salt.sh
View File

@ -2,11 +2,11 @@
# We just download the bootstrap script by default and execute that. # We just download the bootstrap script by default and execute that.
if [ -x /usr/bin/fetch ]; then if [ -x /usr/bin/fetch ]; then
/usr/bin/fetch -o - http://bootstrap.saltstack.org | sh -s -- "$@" /usr/bin/fetch -o - https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh | sh -s -- "$@"
elif [ -x /usr/bin/curl ]; then elif [ -x /usr/bin/curl ]; then
/usr/bin/curl -L http://bootstrap.saltstack.org | sh -s -- "$@" /usr/bin/curl -L https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh | sh -s -- "$@"
else else
python \ python \
-c 'import urllib; print urllib.urlopen("http://bootstrap.saltstack.org").read()' \ -c 'import urllib; print urllib.urlopen("https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh").read()' \
| sh -s -- "$@" | sh -s -- "$@"
fi fi