saltstack/salt-bootstrap
1
0
Fork 0
mirror of https://github.com/saltstack/salt-bootstrap.git synced 2025-04-17 10:10:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allow amazon to work with python2.7 on installs over 2016.11

Browse source
This commit is contained in:
Ch3LL 2017-05-22 09:56:00 -04:00
parent 3750240fcf
commit a99dcc058e
No known key found for this signature in database
GPG key ID: E913CB5901E0C81C
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
bootstrap-salt.sh
View file

@ -4461,7 +4461,11 @@ install_amazon_linux_ami_deps() {
# Shim to figure out if we're using old (rhel) or new (aws) rpms.
_USEAWS=$BS_FALSE
repo_rev="$(echo "${GIT_REV:-$STABLE_REV}" | sed 's|.*\/||g')"
if [ "$ITYPE" = "stable" ]; then
repo_rev="$(echo "${STABLE_REV}" | sed 's|.*\/||g')"
else
repo_rev="latest"
fi
if echo "$repo_rev" | egrep -q '^(latest|2016\.11)$'; then
_USEAWS=$BS_TRUE
@ -4538,6 +4542,13 @@ install_amazon_linux_ami_git_deps() {
yum -y install ca-certificates || return 1
fi
PIP_EXE='pip'
if [ "$(echo "$GIT_REV" | egrep -o '2[0-9]{3}')" -ge 2016 ]; then
[ $(which pip2.7) ] || /usr/bin/easy_install-2.7 pip || echoerror "Could not install pip2.7"
PIP_EXE='/usr/local/bin/pip2.7'
_PY_EXE='python2.7'
fi
install_amazon_linux_ami_deps || return 1
ENABLE_EPEL_CMD=""
@ -4564,7 +4575,7 @@ install_amazon_linux_ami_git_deps() {
# We're on the develop branch, install whichever tornado is on the requirements file
__REQUIRED_TORNADO="$(grep tornado "${_SALT_GIT_CHECKOUT_DIR}/requirements/base.txt")"
if [ "${__REQUIRED_TORNADO}" != "" ]; then
__PACKAGES="${__PACKAGES} python-tornado"
__PACKAGES="${__PACKAGES} ${pkg_append}-tornado"
fi
fi
@ -4575,7 +4586,7 @@ install_amazon_linux_ami_git_deps() {
if [ "${__PIP_PACKAGES}" != "" ]; then
# shellcheck disable=SC2086
pip-python install ${__PIP_PACKAGES} || return 1
${PIP_EXE} install ${__PIP_PACKAGES} || return 1
fi
# Let's trigger config_salt()