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

Merge pull request #1093 from vutny/issue-724-amazon-drop-epel

Browse source 
Remove configuring EPEL repo for Amazon Linux
This commit is contained in:
Nicole Thomas 2017-06-09 13:37:32 -06:00 • committed by GitHub
commit 1bc17a6fa6
1 changed files with 21 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
bootstrap-salt.sh
View file

@ -1811,7 +1811,9 @@ __rpm_import_gpg() {
__yum_install_noinput() { __yum_install_noinput() {
ENABLE_EPEL_CMD="" ENABLE_EPEL_CMD=""
if [ $_DISABLE_REPOS -eq $BS_FALSE ]; then # Skip Amazon Linux for the first round, since EPEL is no longer required.
# See issue #724
if [ $_DISABLE_REPOS -eq $BS_FALSE ] && [ "$DISTRO_NAME_L" != "amazon_linux_ami" ]; then
ENABLE_EPEL_CMD="--enablerepo=${_EPEL_REPO}" ENABLE_EPEL_CMD="--enablerepo=${_EPEL_REPO}"
fi fi
@ -4328,44 +4330,37 @@ daemons_running_alpine_linux() {
install_amazon_linux_ami_deps() { install_amazon_linux_ami_deps() {
# Shim to figure out if we're using old (rhel) or new (aws) rpms. # Shim to figure out if we're using old (rhel) or new (aws) rpms.
_USEAWS=$BS_FALSE _USEAWS=$BS_FALSE
pkg_append="python"
repo_rev="$(echo "${STABLE_REV}" | sed 's|.*\/||g')" repo_rev="$(echo "${STABLE_REV}" | sed 's|.*\/||g')"
if echo "$repo_rev" | egrep -q '^(latest|2016\.11)$'; then if echo "$repo_rev" | egrep -q '^(latest|2016\.11)$' || \
_USEAWS=$BS_TRUE ( echo "$repo_rev" | egrep -q '^[0-9]+$' && [ "$(echo "$repo_rev" | cut -c1-4)" -gt 2016 ] ); then
elif echo "$repo_rev" | egrep -q '^[0-9]+$' && [ "$(echo "$repo_rev" | cut -c1-4)" -gt 2016 ]; then
_USEAWS=$BS_TRUE _USEAWS=$BS_TRUE
pkg_append="python27"
fi fi
# We need to install yum-utils before doing anything else when installing on # We need to install yum-utils before doing anything else when installing on
# Amazon Linux ECS-optimized images. See issue #974. # Amazon Linux ECS-optimized images. See issue #974.
yum -y install yum-utils __yum_install_noinput yum-utils
ENABLE_EPEL_CMD="" # Do upgrade early
if [ $_DISABLE_REPOS -eq $BS_TRUE ]; then if [ "$_UPGRADE_SYS" -eq $BS_TRUE ]; then
ENABLE_EPEL_CMD="--enablerepo=${_EPEL_REPO}" yum -y update || return 1
fi fi
if [ $_DISABLE_REPOS -eq $BS_FALSE ]; then if [ $_DISABLE_REPOS -eq $BS_FALSE ] || [ "$_CUSTOM_REPO_URL" != "null" ]; then
# enable the EPEL repo
/usr/bin/yum-config-manager --enable epel || return 1
# exclude Salt and ZeroMQ packages from EPEL
/usr/bin/yum-config-manager epel --setopt "epel.exclude=zeromq* salt* python-zmq*" --save || return 1
__REPO_FILENAME="saltstack-repo.repo" __REPO_FILENAME="saltstack-repo.repo"
# Set a few vars to make life easier. # Set a few vars to make life easier.
if [ $_USEAWS -eq $BS_TRUE ]; then if [ $_USEAWS -eq $BS_TRUE ]; then
base_url="$HTTP_VAL://repo.saltstack.com/yum/amazon/latest/\$basearch/$repo_rev/" base_url="$HTTP_VAL://${_REPO_URL}/yum/amazon/latest/\$basearch/$repo_rev/"
gpg_key="${base_url}SALTSTACK-GPG-KEY.pub" gpg_key="${base_url}SALTSTACK-GPG-KEY.pub"
repo_name="SaltStack repo for Amazon Linux" repo_name="SaltStack repo for Amazon Linux"
pkg_append="python27"
else else
base_url="$HTTP_VAL://repo.saltstack.com/yum/redhat/6/\$basearch/$repo_rev/" base_url="$HTTP_VAL://${_REPO_URL}/yum/redhat/6/\$basearch/$repo_rev/"
gpg_key="${base_url}SALTSTACK-GPG-KEY.pub" gpg_key="${base_url}SALTSTACK-GPG-KEY.pub"
repo_name="SaltStack repo for RHEL/CentOS 6" repo_name="SaltStack repo for RHEL/CentOS 6"
pkg_append="python"
fi fi
# This should prob be refactored to use __install_saltstack_rhel_repository() # This should prob be refactored to use __install_saltstack_rhel_repository()
@ -4383,21 +4378,19 @@ baseurl=$base_url
_eof _eof
fi fi
if [ "$_UPGRADE_SYS" -eq $BS_TRUE ]; then
yum -y update || return 1
fi
fi fi
#ordereddict removed.
#Package python-ordereddict-1.1-2.el6.noarch is obsoleted by python26-2.6.9-2.88.amzn1.x86_64 which is already installed # Package python-ordereddict-1.1-2.el6.noarch is obsoleted by python26-2.6.9-2.88.amzn1.x86_64
# which is already installed
__PACKAGES="${pkg_append}-PyYAML ${pkg_append}-crypto ${pkg_append}-msgpack ${pkg_append}-zmq ${pkg_append}-jinja2 ${pkg_append}-requests" __PACKAGES="${pkg_append}-PyYAML ${pkg_append}-crypto ${pkg_append}-msgpack ${pkg_append}-zmq ${pkg_append}-jinja2 ${pkg_append}-requests"
# shellcheck disable=SC2086 # shellcheck disable=SC2086
yum -y install ${__PACKAGES} ${ENABLE_EPEL_CMD} || return 1 __yum_install_noinput ${__PACKAGES} || return 1
if [ "${_EXTRA_PACKAGES}" != "" ]; then if [ "${_EXTRA_PACKAGES}" != "" ]; then
echoinfo "Installing the following extra packages as requested: ${_EXTRA_PACKAGES}" echoinfo "Installing the following extra packages as requested: ${_EXTRA_PACKAGES}"
# shellcheck disable=SC2086 # shellcheck disable=SC2086
yum install -y ${_EXTRA_PACKAGES} ${ENABLE_EPEL_CMD} || return 1 __yum_install_noinput ${_EXTRA_PACKAGES} || return 1
fi fi
} }
@ -4417,13 +4410,8 @@ install_amazon_linux_ami_git_deps() {
install_amazon_linux_ami_deps || return 1 install_amazon_linux_ami_deps || return 1
ENABLE_EPEL_CMD=""
if [ $_DISABLE_REPOS -eq $BS_TRUE ]; then
ENABLE_EPEL_CMD="--enablerepo=${_EPEL_REPO}"
fi
if ! __check_command_exists git; then if ! __check_command_exists git; then
yum -y install git ${ENABLE_EPEL_CMD} || return 1 __yum_install_noinput git || return 1
fi fi
__git_clone_and_checkout || return 1 __git_clone_and_checkout || return 1
@ -4447,7 +4435,7 @@ install_amazon_linux_ami_git_deps() {
if [ "${__PACKAGES}" != "" ]; then if [ "${__PACKAGES}" != "" ]; then
# shellcheck disable=SC2086 # shellcheck disable=SC2086
yum -y install ${__PACKAGES} ${ENABLE_EPEL_CMD} || return 1 __yum_install_noinput ${__PACKAGES} || return 1
fi fi
if [ "${__PIP_PACKAGES}" != "" ]; then if [ "${__PIP_PACKAGES}" != "" ]; then