allow bootstrap-salt to install specific verion even if -r is used

This commit is contained in:
m0duspwnens
2022-06-30 15:10:13 -04:00
parent 0ebd957308
commit 7524ea2c05

View File

@@ -4216,17 +4216,30 @@ install_centos_stable_deps() {
install_centos_stable() {
__PACKAGES=""
local cloud='salt-cloud'
local master='salt-master'
local minion='salt-minion'
local syndic='salt-syndic'
if echo "$STABLE_REV" | grep -q "archive";then
local ver=$(echo "$STABLE_REV"|awk -F/ '{print $2}')
cloud+="-$ver"
master+="-$ver"
minion+="-$ver"
syndic+="-$ver"
fi
if [ "$_INSTALL_CLOUD" -eq $BS_TRUE ];then
__PACKAGES="${__PACKAGES} salt-cloud"
__PACKAGES="${__PACKAGES} $cloud"
fi
if [ "$_INSTALL_MASTER" -eq $BS_TRUE ];then
__PACKAGES="${__PACKAGES} salt-master"
__PACKAGES="${__PACKAGES} $master"
fi
if [ "$_INSTALL_MINION" -eq $BS_TRUE ]; then
__PACKAGES="${__PACKAGES} salt-minion"
__PACKAGES="${__PACKAGES} $minion"
fi
if [ "$_INSTALL_SYNDIC" -eq $BS_TRUE ];then
__PACKAGES="${__PACKAGES} salt-syndic"
__PACKAGES="${__PACKAGES} $syndic"
fi
# shellcheck disable=SC2086