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

improve logic to install repo

Browse source
This commit is contained in:
Ch3LL 2017-04-19 14:38:37 -04:00
parent 80a175aa02
commit b85aa79e35
No known key found for this signature in database
GPG key ID: E913CB5901E0C81C
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
bootstrap-salt.sh
View file

@ -241,6 +241,7 @@ _CUSTOM_MINION_CONFIG="null"
_QUIET_GIT_INSTALLATION=$BS_FALSE
_REPO_URL="repo.saltstack.com"
_PY_EXE=""
_INSTALL_PY="$BS_FALSE"
#--- FUNCTION -------------------------------------------------------------------------------------------------------
# NAME: __usage
@ -1102,17 +1103,21 @@ __install_python_and_deps() {
PY_PKG_V=$(echo "$_PY_EXE" | sed -r "s/\.//g")
__PACKAGES="${PY_PKG_V}"
case "$DISTRO_NAME_L" in
[red_hat] | [centos]*)
__PYTHON_REPO_URL="https://centos${DISTRO_MAJOR_VERSION}.iuscommunity.org/ius-release.rpm"
;;
*)
echoerror "__install_python_and_deps is not currently supported on your platform"
exit 1
;;
esac
if [ $_DISABLE_REPOS -eq $BS_FALSE ]; then
echoinfo "Attempting to install a repo to help provide a separate python package"
echoinfo "$DISTRO_NAME_L"
case "$DISTRO_NAME_L" in
"red_hat"|"centos")
__PYTHON_REPO_URL="https://centos${DISTRO_MAJOR_VERSION}.iuscommunity.org/ius-release.rpm"
;;
*)
echoerror "Installing a repo to provide a python package is only supported on Redhat/CentOS.
If a repo is already available please try running script with -r"
exit 1
;;
esac
echoinfo "Installing IUS repo"
__yum_install_noinput "${__PYTHON_REPO_URL}" || return 1
fi
@ -3754,7 +3759,7 @@ install_centos_git_deps() {
__PACKAGES="${__PACKAGES} python-libcloud"
fi
if [ "${_INSTALL_PY:='None'}" = "${BS_TRUE}" ]; then
if [ "${_INSTALL_PY}" = "${BS_TRUE}" ]; then
__install_python_and_deps || return 1
else
# shellcheck disable=SC2086