From 3a02ef92795ab27c21fc40c6c6926c08acc018bd Mon Sep 17 00:00:00 2001
From: Bryce Larson <brycel@vmware.com>
Date: Wed, 21 Jul 2021 21:44:13 +0000
Subject: [PATCH] make python3 the default

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
---
 bootstrap-salt.sh | 28 +---------------------------
 1 file changed, 1 insertion(+), 27 deletions(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index cb9b3d7..0d58d31 100644
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -268,7 +268,7 @@ _CUSTOM_MASTER_CONFIG="null"
 _CUSTOM_MINION_CONFIG="null"
 _QUIET_GIT_INSTALLATION=$BS_FALSE
 _REPO_URL="repo.saltproject.io"
-_PY_EXE=""
+_PY_EXE="python3"
 _INSTALL_PY="$BS_FALSE"
 _TORNADO_MAX_PY3_VERSION="5.0"
 _POST_NEON_INSTALL=$BS_FALSE
@@ -3015,15 +3015,6 @@ install_ubuntu_stable_deps() {
         _SLEEP=10
     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
         echowarn "Not starting daemons on Debian based distributions is not working mostly because starting them is the default behaviour."
     fi
@@ -3418,15 +3409,6 @@ install_debian_deps() {
         __apt_get_upgrade_noinput || return 1
     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
         PY_PKG_VER=3
     else
@@ -4163,14 +4145,6 @@ install_centos_stable_deps() {
         yum -y update || return 1
     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
         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."