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

move logic to python2.7 and fix repo_rev

Browse source
This commit is contained in:
Ch3LL 2017-05-23 10:02:38 -04:00
parent a99dcc058e
commit 273ee661a9
No known key found for this signature in database
GPG key ID: E913CB5901E0C81C
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
bootstrap-salt.sh
View file

@ -4461,11 +4461,7 @@ install_amazon_linux_ami_deps() {
# Shim to figure out if we're using old (rhel) or new (aws) rpms.
_USEAWS=$BS_FALSE
if [ "$ITYPE" = "stable" ]; then
repo_rev="$(echo "${STABLE_REV}" | sed 's|.*\/||g')"
else
repo_rev="latest"
fi
repo_rev="$(echo "${STABLE_REV}" | sed 's|.*\/||g')"
if echo "$repo_rev" | egrep -q '^(latest|2016\.11)$'; then
_USEAWS=$BS_TRUE
@ -4543,8 +4539,8 @@ install_amazon_linux_ami_git_deps() {
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"
if [ $(command -v python2.7) ]; then
[ $(which pip2.7) ] || /usr/bin/easy_install-2.7 pip || return 1
PIP_EXE='/usr/local/bin/pip2.7'
_PY_EXE='python2.7'
fi