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

removing python 3.6 related code which is no longer needed.

Browse source
This commit is contained in:
Gareth J. Greenaway 2023-04-14 07:08:28 -07:00
parent 4a74744f06
commit b57d37475e
No known key found for this signature in database
GPG key ID: 10B62F8A7CAD7A41
1 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
bootstrap-salt.sh
View file

@ -7460,6 +7460,10 @@ install_opensuse_git_deps() {
return 0
}
install_opensuse_onedir_deps() {
install_opensuse_stable_deps || return 1
}
install_opensuse_stable() {
__PACKAGES=""
@ -7492,6 +7496,10 @@ install_opensuse_git() {
return 0
}
install_opensuse_onedir() {
install_opensuse_stable || return 1
}
install_opensuse_stable_post() {
for fname in api master minion syndic; do
# Skip salt-api since the service should be opt-in and not necessarily started on boot
@ -7561,6 +7569,10 @@ install_opensuse_git_post() {
return 0
}
install_opensuse_onedir_post() {
install_opensuse_stable_post || return 1
}
install_opensuse_restart_daemons() {
[ $_START_DAEMONS -eq $BS_FALSE ] && return
@ -8066,11 +8078,6 @@ __gentoo_pre_dep() {
mkdir /etc/portage
fi
# Enable Python 3.6 target for pre Neon Salt release
if echo "${STABLE_REV}" | grep -q "2019" || [ "${ITYPE}" = "git" ] && [ "${_POST_NEON_INSTALL}" -eq $BS_FALSE ]; then
EXTRA_PYTHON_TARGET=python3_6
fi
# Enable Python 3.7 target for Salt Neon using GIT
if [ "${ITYPE}" = "git" ] && [ "${GIT_REV}" = "v3000" ]; then
EXTRA_PYTHON_TARGET=python3_7
@ -8216,6 +8223,12 @@ install_gentoo_git() {
return 0
}
install_gentoo_onedir() {
install_gentoo_stable || return 1
}
install_gentoo_post() {
for fname in api master minion syndic; do
# Skip salt-api since the service should be opt-in and not necessarily started on boot
@ -8305,6 +8318,12 @@ _eof
return 0
}
install_gentoo_onedir_post() {
install_gentoo_post || return 1
}
install_gentoo_restart_daemons() {
[ $_START_DAEMONS -eq $BS_FALSE ] && return