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

Add centos8 git support

Browse source
This commit is contained in:
ch3ll 2019-10-30 10:46:14 -04:00
parent 3a8bd84920
commit 73ae07949b
No known key found for this signature in database
GPG key ID: 1124C6796EBDBD8D
1 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
bootstrap-salt.sh
View file

@ -2528,6 +2528,18 @@ __install_pip_pkgs() {
${_pip_cmd} install ${_pip_pkgs} || return 1
}
#--- FUNCTION -------------------------------------------------------------------------------------------------------
# NAME: __install_tornado_pip
# PARAMETERS: python executable
# DESCRIPTION: Return 0 or 1 if successfully able to install tornado<5.0
#----------------------------------------------------------------------------------------------------------------------
__install_tornado_pip() {
# OS needs tornado <5.0 from pip
__check_pip_allowed "You need to allow pip based installations (-P) for Tornado <5.0 in order to install Salt on Python 3"
## install pip if its not installed and install tornado
__install_pip_pkgs "tornado<5.0" "${1}" || return 1
}
#--- FUNCTION -------------------------------------------------------------------------------------------------------
# NAME: __install_pip_deps
# DESCRIPTION: Return 0 or 1 if successfully able to install pip packages via requirements file
@ -3851,13 +3863,9 @@ install_centos_git_deps() {
__git_clone_and_checkout || return 1
if [ "$DISTRO_MAJOR_VERSION" -ge 8 ]; then
__PACKAGES="python3-m2crypto"
else
__PACKAGES="m2crypto"
fi
if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -eq 3 ]; then
_py=${_PY_EXE}
if [ "$DISTRO_MAJOR_VERSION" -ge 8 ]; then
# Packages are named python3-<whatever>
PY_PKG_VER=3
@ -3866,6 +3874,7 @@ install_centos_git_deps() {
PY_PKG_VER=36
fi
else
_py="python"
PY_PKG_VER=""
# Only Py2 needs python-futures
@ -3877,7 +3886,14 @@ install_centos_git_deps() {
fi
fi
__PACKAGES="${__PACKAGES} python${PY_PKG_VER}-crypto python${PY_PKG_VER}-jinja2"
if [ "$DISTRO_MAJOR_VERSION" -ge 8 ]; then
__install_tornado_pip ${_py} || return 1
__PACKAGES="python3-m2crypto"
else
__PACKAGES="m2crypto ${PY_PKG_VER}-crypto"
fi
__PACKAGES="${__PACKAGES} python${PY_PKG_VER}-jinja2"
__PACKAGES="${__PACKAGES} python${PY_PKG_VER}-msgpack python${PY_PKG_VER}-requests"
__PACKAGES="${__PACKAGES} python${PY_PKG_VER}-tornado python${PY_PKG_VER}-zmq"
@ -3895,7 +3911,7 @@ install_centos_git_deps() {
_PIP_PACKAGES="m2crypto!=0.33.0 jinja2 msgpack-python pycrypto PyYAML tornado<5.0 zmq futures>=2.0"
# install swig and openssl on cent6
if [ "$DISTRO_MAJOR_VERSION" -eq 6 ]; then
if [ "$DISTRO_MAJOR_VERSION" -eq 6 ] || [ "$DISTRO_MAJOR_VERSION" -eq 8 ]; then
__yum_install_noinput openssl-devel swig || return 1
fi