Merge pull request #28694 from s0undt3ch/2015.5

[2015.5] Update to latest bootstrap script v2015.11.09
This commit is contained in:
Nicole Thomas 2015-11-09 10:49:53 -07:00
commit 2a40f57b93

View file

@ -17,7 +17,7 @@
# CREATED: 10/15/2012 09:49:37 PM WEST
#======================================================================================================================
set -o nounset # Treat unset variables as an error
__ScriptVersion="2015.11.04"
__ScriptVersion="2015.11.09"
__ScriptName="bootstrap-salt.sh"
#======================================================================================================================
@ -1881,6 +1881,10 @@ install_ubuntu_stable_deps() {
/etc/apt/sources.list.d/saltstack.list
fi
# Make sure wget is available
__apt_get_install_noinput wget
# shellcheck disable=SC2086
wget $_WGET_ARGS -q http://repo.saltstack.com/apt/ubuntu/ubuntu$DISTRO_MAJOR_VERSION/$STABLE_REV/SALTSTACK-GPG-KEY.pub -O - | apt-key add - || return 1