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

Restrict use of dnf to Fedora only, otherwise use yum when dealing with RedHat family

Browse source
This commit is contained in:
David Murphy 2024-12-10 11:26:38 -07:00
parent 54243fea9c
commit e5c03a53aa
No known key found for this signature in database
GPG key ID: 9D7724F37A7424D8
1 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
bootstrap-salt.sh
View file

@ -4224,8 +4224,8 @@ __install_saltstack_rhel_onedir_repository() {
REPO_REV_MAJOR=$(echo "$ONEDIR_REV" | cut -d '.' -f 1) REPO_REV_MAJOR=$(echo "$ONEDIR_REV" | cut -d '.' -f 1)
if [ "$REPO_REV_MAJOR" -eq "3007" ]; then if [ "$REPO_REV_MAJOR" -eq "3007" ]; then
# Enable the Salt 3007 STS repo # Enable the Salt 3007 STS repo
dnf config-manager --set-disable salt-repo-* yum config-manager --set-disable salt-repo-*
dnf config-manager --set-enabled salt-repo-3007-sts yum config-manager --set-enabled salt-repo-3007-sts
fi fi
elif [ "$(echo "$ONEDIR_REV" | grep -E '^([3-9][0-5]{2}[6-9](\.[0-9]*)?)')" != "" ]; then elif [ "$(echo "$ONEDIR_REV" | grep -E '^([3-9][0-5]{2}[6-9](\.[0-9]*)?)')" != "" ]; then
# using minor version # using minor version
@ -4243,11 +4243,11 @@ __install_saltstack_rhel_onedir_repository() {
fi fi
else else
# Enable the Salt LATEST repo # Enable the Salt LATEST repo
dnf config-manager --set-disable salt-repo-* yum config-manager --set-disable salt-repo-*
dnf config-manager --set-enabled salt-repo-latest yum config-manager --set-enabled salt-repo-latest
fi fi
dnf clean expire-cache || return 1 yum clean expire-cache || return 1
dnf makecache || return 1 yum makecache || return 1
elif [ "$ONEDIR_REV" != "latest" ]; then elif [ "$ONEDIR_REV" != "latest" ]; then
echowarn "salt.repo already exists, ignoring salt version argument." echowarn "salt.repo already exists, ignoring salt version argument."
echowarn "Use -F (forced overwrite) to install $ONEDIR_REV." echowarn "Use -F (forced overwrite) to install $ONEDIR_REV."
@ -4559,8 +4559,8 @@ install_centos_onedir() {
fi fi
# shellcheck disable=SC2086 # shellcheck disable=SC2086
dnf makecache || return 1 yum makecache || return 1
dnf list salt-minion || return 1 yum list salt-minion || return 1
__yum_install_noinput ${__PACKAGES} || return 1 __yum_install_noinput ${__PACKAGES} || return 1
return 0 return 0
@ -5661,8 +5661,8 @@ install_amazon_linux_ami_2_deps() {
REPO_REV_MAJOR=$(echo "$STABLE_REV" | cut -d '.' -f 1) REPO_REV_MAJOR=$(echo "$STABLE_REV" | cut -d '.' -f 1)
if [ "$REPO_REV_MAJOR" -eq "3007" ]; then if [ "$REPO_REV_MAJOR" -eq "3007" ]; then
# Enable the Salt 3007 STS repo # Enable the Salt 3007 STS repo
dnf config-manager --set-disable salt-repo-* yum config-manager --set-disable salt-repo-*
dnf config-manager --set-enabled salt-repo-3007-sts yum config-manager --set-enabled salt-repo-3007-sts
fi fi
elif [ "$(echo "$STABLE_REV" | grep -E '^([3-9][0-5]{2}[6-9](\.[0-9]*)?)')" != "" ]; then elif [ "$(echo "$STABLE_REV" | grep -E '^([3-9][0-5]{2}[6-9](\.[0-9]*)?)')" != "" ]; then
# using minor version # using minor version
@ -5680,11 +5680,11 @@ install_amazon_linux_ami_2_deps() {
fi fi
else else
# Enable the Salt LATEST repo # Enable the Salt LATEST repo
dnf config-manager --set-disable salt-repo-* yum config-manager --set-disable salt-repo-*
dnf config-manager --set-enabled salt-repo-latest yum config-manager --set-enabled salt-repo-latest
fi fi
dnf clean expire-cache || return 1 yum clean expire-cache || return 1
dnf makecache || return 1 yum makecache || return 1
fi fi
fi fi
@ -5726,8 +5726,8 @@ install_amazon_linux_ami_2_onedir_deps() {
REPO_REV_MAJOR=$(echo "$ONEDIR_REV" | cut -d '.' -f 1) REPO_REV_MAJOR=$(echo "$ONEDIR_REV" | cut -d '.' -f 1)
if [ "$REPO_REV_MAJOR" -eq "3007" ]; then if [ "$REPO_REV_MAJOR" -eq "3007" ]; then
# Enable the Salt 3007 STS repo # Enable the Salt 3007 STS repo
dnf config-manager --set-disable salt-repo-* yum config-manager --set-disable salt-repo-*
dnf config-manager --set-enabled salt-repo-3007-sts yum config-manager --set-enabled salt-repo-3007-sts
fi fi
elif [ "$(echo "$ONEDIR_REV" | grep -E '^([3-9][0-5]{2}[6-9](\.[0-9]*)?)')" != "" ]; then elif [ "$(echo "$ONEDIR_REV" | grep -E '^([3-9][0-5]{2}[6-9](\.[0-9]*)?)')" != "" ]; then
# using minor version # using minor version
@ -5745,11 +5745,11 @@ install_amazon_linux_ami_2_onedir_deps() {
fi fi
else else
# Enable the Salt LATEST repo # Enable the Salt LATEST repo
dnf config-manager --set-disable salt-repo-* yum config-manager --set-disable salt-repo-*
dnf config-manager --set-enabled salt-repo-latest yum config-manager --set-enabled salt-repo-latest
fi fi
dnf clean expire-cache || return 1 yum clean expire-cache || return 1
dnf makecache || return 1 yum makecache || return 1
fi fi
fi fi
@ -5879,8 +5879,8 @@ install_amazon_linux_ami_2023_onedir_deps() {
REPO_REV_MAJOR=$(echo "$ONEDIR_REV" | cut -d '.' -f 1) REPO_REV_MAJOR=$(echo "$ONEDIR_REV" | cut -d '.' -f 1)
if [ "$REPO_REV_MAJOR" -eq "3007" ]; then if [ "$REPO_REV_MAJOR" -eq "3007" ]; then
# Enable the Salt 3007 STS repo # Enable the Salt 3007 STS repo
dnf config-manager --set-disable salt-repo-* yum config-manager --set-disable salt-repo-*
dnf config-manager --set-enabled salt-repo-3007-sts yum config-manager --set-enabled salt-repo-3007-sts
fi fi
elif [ "$(echo "$ONEDIR_REV" | grep -E '^([3-9][0-5]{2}[6-9](\.[0-9]*)?)')" != "" ]; then elif [ "$(echo "$ONEDIR_REV" | grep -E '^([3-9][0-5]{2}[6-9](\.[0-9]*)?)')" != "" ]; then
# using minor version # using minor version
@ -5898,11 +5898,11 @@ install_amazon_linux_ami_2023_onedir_deps() {
fi fi
else else
# Enable the Salt LATEST repo # Enable the Salt LATEST repo
dnf config-manager --set-disable salt-repo-* yum config-manager --set-disable salt-repo-*
dnf config-manager --set-enabled salt-repo-latest yum config-manager --set-enabled salt-repo-latest
fi fi
dnf clean expire-cache || return 1 yum clean expire-cache || return 1
dnf makecache || return 1 yum makecache || return 1
fi fi
fi fi