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

Merge pull request #1261 from rallytime/fedora-26-eol

Browse source 
Remove support for Fedora 26
This commit is contained in:
Nicole Thomas 2018-07-11 11:33:53 -04:00 • committed by GitHub
commit c345e3e419
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.rst
View file

@ -257,7 +257,7 @@ Red Hat family
- Amazon Linux 2012.3 and later - Amazon Linux 2012.3 and later
- CentOS 6/7 - CentOS 6/7
- Cloud Linux 6/7 - Cloud Linux 6/7
- Fedora 26/27/28 (install latest stable from standard repositories) - Fedora 27/28 (install latest stable from standard repositories)
- Oracle Linux 6/7 - Oracle Linux 6/7
- Red Hat Enterprise Linux 6/7 - Red Hat Enterprise Linux 6/7
- Scientific Linux 6/7 - Scientific Linux 6/7

12
bootstrap-salt.sh
View file

@ -1556,8 +1556,8 @@ __check_end_of_life_versions() {
;; ;;
fedora) fedora)
# Fedora lower than 26 are no longer supported # Fedora lower than 27 are no longer supported
if [ "$DISTRO_MAJOR_VERSION" -lt 26 ]; then if [ "$DISTRO_MAJOR_VERSION" -lt 27 ]; then
echoerror "End of life distributions are not supported." echoerror "End of life distributions are not supported."
echoerror "Please consider upgrading to the next stable. See:" echoerror "Please consider upgrading to the next stable. See:"
echoerror " https://fedoraproject.org/wiki/Releases" echoerror " https://fedoraproject.org/wiki/Releases"
@ -3404,15 +3404,9 @@ install_debian_check_services() {
install_fedora_deps() { install_fedora_deps() {
__PACKAGES="libyaml m2crypto PyYAML python-crypto python-jinja2" __PACKAGES="dnf-utils libyaml m2crypto PyYAML python-crypto python-jinja2"
__PACKAGES="${__PACKAGES} python2-msgpack python2-requests python-zmq" __PACKAGES="${__PACKAGES} python2-msgpack python2-requests python-zmq"
if [ "$DISTRO_MAJOR_VERSION" -lt 26 ]; then
__PACKAGES="${__PACKAGES} yum-utils"
else
__PACKAGES="${__PACKAGES} dnf-utils"
fi
# shellcheck disable=SC2086 # shellcheck disable=SC2086
dnf install -y ${__PACKAGES} || return 1 dnf install -y ${__PACKAGES} || return 1