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

Add Ubuntu 20.10 support using Ubuntu 20.04 packages

Browse source 
Remove support for Debian 8
Remove support for Ubuntu 14.04, 18.10, 19.04, and 19.10
This commit is contained in:
Joseph Pacura 2021-01-22 19:33:18 -05:00 • committed by Pedro Algarvio
parent 4310738bc4
commit f311d100ad
2 changed files with 15 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.rst
View file

@ -499,8 +499,8 @@ repositories are not provided on `SaltStack's Ubuntu repository`_ for the non-LT
bootstrap script will attempt to install the packages for the most closely related LTS Ubuntu bootstrap script will attempt to install the packages for the most closely related LTS Ubuntu
release instead. release instead.
For example, when installing Salt on Ubuntu 18.10, the bootstrap script will setup the repository For example, when installing Salt on Ubuntu 20.10, the bootstrap script will setup the repository
for Ubuntu 18.04 from `SaltStack's Ubuntu repository`_ and install the 18.04 packages. for Ubuntu 20.04 from `SaltStack's Ubuntu repository`_ and install the 20.04 packages.
Non-LTS Ubuntu releases are not supported once the release reaches End-of-Life as defined by Non-LTS Ubuntu releases are not supported once the release reaches End-of-Life as defined by
`Ubuntu's release schedule`_. `Ubuntu's release schedule`_.

32
bootstrap-salt.sh
View file

@ -1545,12 +1545,6 @@ __debian_derivatives_translation() {
__debian_codename_translation() { __debian_codename_translation() {
case $DISTRO_MAJOR_VERSION in case $DISTRO_MAJOR_VERSION in
"7")
DISTRO_CODENAME="wheezy"
;;
"8")
DISTRO_CODENAME="jessie"
;;
"9") "9")
DISTRO_CODENAME="stretch" DISTRO_CODENAME="stretch"
;; ;;
@ -1561,7 +1555,7 @@ __debian_codename_translation() {
DISTRO_CODENAME="bullseye" DISTRO_CODENAME="bullseye"
;; ;;
*) *)
DISTRO_CODENAME="jessie" DISTRO_CODENAME="stretch"
;; ;;
esac esac
} }
@ -1574,8 +1568,8 @@ __debian_codename_translation() {
__check_end_of_life_versions() { __check_end_of_life_versions() {
case "${DISTRO_NAME_L}" in case "${DISTRO_NAME_L}" in
debian) debian)
# Debian versions below 7 are not supported # Debian versions below 9 are not supported
if [ "$DISTRO_MAJOR_VERSION" -lt 8 ]; then if [ "$DISTRO_MAJOR_VERSION" -lt 9 ]; 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://wiki.debian.org/DebianReleases" echoerror " https://wiki.debian.org/DebianReleases"
@ -1586,15 +1580,16 @@ __check_end_of_life_versions() {
ubuntu) ubuntu)
# Ubuntu versions not supported # Ubuntu versions not supported
# #
# < 14.04 # < 16.04
# = 14.10
# = 15.04, 15.10
# = 16.10 # = 16.10
# = 17.04, 17.10 # = 17.04, 17.10
if [ "$DISTRO_MAJOR_VERSION" -lt 14 ] || \ # = 18.10
[ "$DISTRO_MAJOR_VERSION" -eq 15 ] || \ # = 19.04, 19.10
if [ "$DISTRO_MAJOR_VERSION" -lt 16 ] || \
[ "$DISTRO_MAJOR_VERSION" -eq 17 ] || \ [ "$DISTRO_MAJOR_VERSION" -eq 17 ] || \
{ [ "$DISTRO_MAJOR_VERSION" -eq 16 ] && [ "$DISTRO_MINOR_VERSION" -eq 10 ]; }; then [ "$DISTRO_MAJOR_VERSION" -eq 19 ] || \
{ [ "$DISTRO_MAJOR_VERSION" -eq 16 ] && [ "$DISTRO_MINOR_VERSION" -eq 10 ]; } || \
{ [ "$DISTRO_MAJOR_VERSION" -eq 18 ] && [ "$DISTRO_MINOR_VERSION" -eq 10 ]; }; 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://wiki.ubuntu.com/Releases" echoerror " https://wiki.ubuntu.com/Releases"
@ -2912,11 +2907,10 @@ __enable_universe_repository() {
__install_saltstack_ubuntu_repository() { __install_saltstack_ubuntu_repository() {
# Workaround for latest non-LTS ubuntu # Workaround for latest non-LTS ubuntu
if [ "$DISTRO_MAJOR_VERSION" -eq 19 ] || \ if { [ "$DISTRO_MAJOR_VERSION" -eq 20 ] && [ "$DISTRO_MINOR_VERSION" -eq 10 ]; }; then
{ [ "$DISTRO_MAJOR_VERSION" -eq 18 ] && [ "$DISTRO_MINOR_VERSION" -eq 10 ]; }; then
echowarn "Non-LTS Ubuntu detected, but stable packages requested. Trying packages for previous LTS release. You may experience problems." echowarn "Non-LTS Ubuntu detected, but stable packages requested. Trying packages for previous LTS release. You may experience problems."
UBUNTU_VERSION=18.04 UBUNTU_VERSION=20.04
UBUNTU_CODENAME="bionic" UBUNTU_CODENAME="focal"
else else
UBUNTU_VERSION=${DISTRO_VERSION} UBUNTU_VERSION=${DISTRO_VERSION}
UBUNTU_CODENAME=${DISTRO_CODENAME} UBUNTU_CODENAME=${DISTRO_CODENAME}