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

make python3 the default

Browse source 
This should be released to stable at the same time or right before
3000.x releases are moved from repo.saltproject.io to
archive.repo.saltproject.io on 2021-09-15
This commit is contained in:
Bryce Larson 2021-07-21 21:44:13 +00:00 • committed by Kirill Ponomarev
parent 8f39791c2c
commit 94ebb80bdb
1 changed files with 1 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
bootstrap-salt.sh
View file

@ -268,7 +268,7 @@ _CUSTOM_MASTER_CONFIG="null"
_CUSTOM_MINION_CONFIG="null" _CUSTOM_MINION_CONFIG="null"
_QUIET_GIT_INSTALLATION=$BS_FALSE _QUIET_GIT_INSTALLATION=$BS_FALSE
_REPO_URL="repo.saltproject.io" _REPO_URL="repo.saltproject.io"
_PY_EXE="" _PY_EXE="python3"
_INSTALL_PY="$BS_FALSE" _INSTALL_PY="$BS_FALSE"
_TORNADO_MAX_PY3_VERSION="5.0" _TORNADO_MAX_PY3_VERSION="5.0"
_POST_NEON_INSTALL=$BS_FALSE _POST_NEON_INSTALL=$BS_FALSE
@ -3015,15 +3015,6 @@ install_ubuntu_stable_deps() {
_SLEEP=10 _SLEEP=10
fi fi
if [ "$DISTRO_MAJOR_VERSION" -ge 20 ]; then
# Default Ubuntu 20.04 to Py3
if [ "x${_PY_EXE}" = "x" ]; then
_PY_EXE=python3
_PY_MAJOR_VERSION=3
PY_PKG_VER=3
fi
fi
if [ $_START_DAEMONS -eq $BS_FALSE ]; then if [ $_START_DAEMONS -eq $BS_FALSE ]; then
echowarn "Not starting daemons on Debian based distributions is not working mostly because starting them is the default behaviour." echowarn "Not starting daemons on Debian based distributions is not working mostly because starting them is the default behaviour."
fi fi
@ -3418,15 +3409,6 @@ install_debian_deps() {
__apt_get_upgrade_noinput || return 1 __apt_get_upgrade_noinput || return 1
fi fi
if [ "$DISTRO_MAJOR_VERSION" -ge 10 ]; then
# Default Debian 10 to Py3
if [ "x${_PY_EXE}" = "x" ]; then
_PY_EXE=python3
_PY_MAJOR_VERSION=3
PY_PKG_VER=3
fi
fi
if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -eq 3 ]; then if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -eq 3 ]; then
PY_PKG_VER=3 PY_PKG_VER=3
else else
@ -4163,14 +4145,6 @@ install_centos_stable_deps() {
yum -y update || return 1 yum -y update || return 1
fi fi
if [ "$DISTRO_MAJOR_VERSION" -ge 8 ]; then
# CentOS/RHEL 8 Default to Py3
if [ "x${_PY_EXE}" = "x" ]; then
_PY_EXE=python3
_PY_MAJOR_VERSION=3
fi
fi
if [ "$_DISABLE_REPOS" -eq "$BS_TRUE" ] && [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -eq 3 ]; then if [ "$_DISABLE_REPOS" -eq "$BS_TRUE" ] && [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -eq 3 ]; then
echowarn "Detected -r or -R option while installing Salt packages for Python 3." echowarn "Detected -r or -R option while installing Salt packages for Python 3."
echowarn "Python 3 packages for older Salt releases requires the EPEL repository to be installed." echowarn "Python 3 packages for older Salt releases requires the EPEL repository to be installed."