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

Merge branch 'develop' into new_stable

Browse source
This commit is contained in:
krionbsd 2021-09-17 09:27:23 +02:00
commit 1a1e74b689
3 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,5 +1,9 @@
Version TBD (In Progress on the Develop Branch):
Version 2021.09.17:
* Re-add Ubuntu-16 support as it's still supported with 3001 and 3002 (krionbsd) #1594
* Add oncoming 3004 release (krionbsd) #1593
Version 2021.09.14:
* Update latest Salt version in README (krionbsd) #1588
* Make Python 3 the default (bryceml) #1577

5
README.rst
View file

@ -32,6 +32,7 @@ sum** of the downloaded ``bootstrap-salt.sh`` file.
The SHA256 sum of the ``bootstrap-salt.sh`` file, per release, is:
- 2021.09.14: ``30fdcba972f449630b4f13492cb5525e69e08fa2cdb66a6dc78f1536ad279e52``
- 2021.08.19: ``ee40a9d8d057cce88a288fc1cb94b1d31408a61d262db6f77b34ad63d66f0806``
- 2021.06.23: ``35b397dd0a50f832af453c17f138fd29e3692e492d7f463c404a57e1fac10665``
- 2021.03.02: ``91baa0073308f1be20c7be65238ef67e5733c75285314b302a5b2456e73a0758``
@ -533,8 +534,8 @@ UNIX systems
Using a custom salt bootstrap
-----------------------------
By default the ``salt-cloud -p`` provisioning command will use the latest release from this
repository to bootstrap new minions. If
By default the ``salt-cloud -p`` provisioning command will use the latest release from this
repository to bootstrap new minions. If
- your needs are not met by that script,
- you want to lock salt bootstrap to a specific release, or

14
bootstrap-salt.sh
View file

@ -23,7 +23,7 @@
#======================================================================================================================
set -o nounset # Treat unset variables as an error
__ScriptVersion="2021.09.14"
__ScriptVersion="2021.09.17"
__ScriptName="bootstrap-salt.sh"
__ScriptFullName="$0"
@ -604,7 +604,7 @@ elif [ "$ITYPE" = "stable" ]; then
if [ "$#" -eq 0 ];then
STABLE_REV="latest"
else
if [ "$(echo "$1" | grep -E '^(latest|1\.6|1\.7|2014\.1|2014\.7|2015\.5|2015\.8|2016\.3|2016\.11|2017\.7|2018\.3|2019\.2|3000|3001|3002|3003)$')" != "" ]; then
if [ "$(echo "$1" | grep -E '^(latest|1\.6|1\.7|2014\.1|2014\.7|2015\.5|2015\.8|2016\.3|2016\.11|2017\.7|2018\.3|2019\.2|3000|3001|3002|3003|3004)$')" != "" ]; then
STABLE_REV="$1"
shift
elif [ "$(echo "$1" | grep -E '^(2[0-9]*\.[0-9]*\.[0-9]*|[3-9][0-9]{3}(\.[0-9]*)?)$')" != "" ]; then
@ -615,7 +615,7 @@ elif [ "$ITYPE" = "stable" ]; then
fi
shift
else
echo "Unknown stable version: $1 (valid: 1.6, 1.7, 2014.1, 2014.7, 2015.5, 2015.8, 2016.3, 2016.11, 2017.7, 2018.3, 2019.2, 3000, 3001, 3002, 3003, latest, \$MAJOR.\$MINOR.\$PATCH until 2019.2, \$MAJOR or \$MAJOR.\$PATCH starting from 3000)"
echo "Unknown stable version: $1 (valid: 1.6, 1.7, 2014.1, 2014.7, 2015.5, 2015.8, 2016.3, 2016.11, 2017.7, 2018.3, 2019.2, 3000, 3001, 3002, 3003, 3004, latest, \$MAJOR.\$MINOR.\$PATCH until 2019.2, \$MAJOR or \$MAJOR.\$PATCH starting from 3000)"
exit 1
fi
fi
@ -1585,11 +1585,15 @@ __check_end_of_life_versions() {
ubuntu)
# Ubuntu versions not supported
#
# < 18.04
# < 16.04
# = 16.10
# = 17.04, 17.10
# = 18.10
# = 19.04, 19.10
if [ "$DISTRO_MAJOR_VERSION" -lt 18 ] || \
if [ "$DISTRO_MAJOR_VERSION" -lt 16 ] || \
[ "$DISTRO_MAJOR_VERSION" -eq 17 ] || \
[ "$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 "Please consider upgrading to the next stable. See:"