mirror of
https://github.com/saltstack/salt-bootstrap.git
synced 2025-04-17 10:10:25 +00:00
Removing EPEL, which is no longer needed.
This commit is contained in:
parent
043068bba3
commit
861dfd082b
1 changed files with 0 additions and 26 deletions
|
@ -4374,30 +4374,6 @@ install_fedora_check_services() {
|
|||
#
|
||||
# CentOS Install Functions
|
||||
#
|
||||
__install_epel_repository() {
|
||||
if [ ${_EPEL_REPOS_INSTALLED} -eq $BS_TRUE ]; then
|
||||
return 0
|
||||
fi
|
||||
|
||||
# Check if epel repo is already enabled and flag it accordingly
|
||||
if yum repolist | grep -q "^[!]\\?${_EPEL_REPO}/"; then
|
||||
_EPEL_REPOS_INSTALLED=$BS_TRUE
|
||||
return 0
|
||||
fi
|
||||
|
||||
# Download latest 'epel-next-release' package for the distro version directly
|
||||
epel_next_repo_url="${HTTP_VAL}://dl.fedoraproject.org/pub/epel/epel-next-release-latest-${DISTRO_MAJOR_VERSION}.noarch.rpm"
|
||||
|
||||
# Download latest 'epel-release' package for the distro version directly
|
||||
epel_repo_url="${HTTP_VAL}://dl.fedoraproject.org/pub/epel/epel-release-latest-${DISTRO_MAJOR_VERSION}.noarch.rpm"
|
||||
|
||||
yum -y install "${epel_next_repo_url}" "${epel_repo_url}"
|
||||
|
||||
_EPEL_REPOS_INSTALLED=$BS_TRUE
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
__install_saltstack_rhel_repository() {
|
||||
if [ "$ITYPE" = "stable" ]; then
|
||||
repo_rev="$STABLE_REV"
|
||||
|
@ -4520,7 +4496,6 @@ install_centos_stable_deps() {
|
|||
fi
|
||||
|
||||
if [ "$_DISABLE_REPOS" -eq "$BS_FALSE" ]; then
|
||||
__install_epel_repository || return 1
|
||||
__install_saltstack_rhel_repository || return 1
|
||||
fi
|
||||
|
||||
|
@ -4824,7 +4799,6 @@ install_centos_onedir_deps() {
|
|||
fi
|
||||
|
||||
if [ "$_DISABLE_REPOS" -eq "$BS_FALSE" ]; then
|
||||
__install_epel_repository || return 1
|
||||
__install_saltstack_rhel_onedir_repository || return 1
|
||||
fi
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue