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

fix for Amazon Linux

Browse source 
- enable EPEL repo with yum-config-manager
- exclude zeromq* salt* python-zmq* packages from the EPEL repo
- move the install repo to repo.saltstack.com
- install python26-ordereddict package as python-ordereddict has been removed
This commit is contained in:
shawnbutts 2015-12-04 13:47:24 -05:00
parent b2e5d84738
commit 9b6bfc9aad
1 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
bootstrap-salt.sh
View file

@ -1793,6 +1793,8 @@ __enable_universe_repository() {
add-apt-repository -y "deb http://old-releases.ubuntu.com/ubuntu $(lsb_release -sc) universe" || return 1
fi
add-apt-repository -y "deb http://old-releases.ubuntu.com/ubuntu $(lsb_release -sc) universe" || return 1
return 0
}
@ -3668,29 +3670,31 @@ install_amazon_linux_ami_2010_git_deps() {
}
install_amazon_linux_ami_deps() {
# According to http://aws.amazon.com/amazon-linux-ami/faqs/#epel we should
# enable the EPEL repo
/usr/bin/yum-config-manager --enable epel || return 1
# enable the EPEL 6 repo
if [ "$CPU_ARCH_L" = "i686" ]; then
EPEL_ARCH="i386"
else
EPEL_ARCH=$CPU_ARCH_L
fi
rpm -Uvh --force "http://mirrors.kernel.org/fedora-epel/6/${EPEL_ARCH}/epel-release-6-8.noarch.rpm" || 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-salt-epel-6.repo"
__REPO_FILENAME="saltstack-repo.repo"
if [ ! -s "/etc/yum.repos.d/${__REPO_FILENAME}" ]; then
echoinfo "Adding SaltStack's COPR repository"
__fetch_url /etc/yum.repos.d/${__REPO_FILENAME} \
"https://copr.fedorainfracloud.org/coprs/saltstack/salt/repo/epel-6/${__REPO_FILENAME}" || return 1
cat <<_eof > "/etc/yum.repos.d/${__REPO_FILENAME}"
[saltstack-repo]
disabled=False
name=SaltStack repo for RHEL/CentOS 6
gpgcheck=1
gpgkey=https://repo.saltstack.com/yum/rhel6/SALTSTACK-GPG-KEY.pub
baseurl=https://repo.saltstack.com/yum/rhel6
humanname=SaltStack repo for RHEL/CentOS 6
_eof
fi
if [ "$_UPGRADE_SYS" -eq $BS_TRUE ]; then
yum -y update || return 1
fi
__PACKAGES="PyYAML m2crypto python-crypto python-msgpack python-zmq python-ordereddict python-jinja2 python-requests"
__PACKAGES="PyYAML m2crypto python-crypto python-msgpack python-zmq python26-ordereddict python-jinja2 python-requests"
if [ "$_INSTALL_CLOUD" -eq $BS_TRUE ]; then
check_pip_allowed "You need to allow pip based installations (-P) in order to install apache-libcloud"
@ -4712,6 +4716,7 @@ install_suse_12_stable_deps() {
if [ "${SUSE_PATCHLEVEL}" != "" ]; then
DISTRO_PATCHLEVEL="_SP${SUSE_PATCHLEVEL}"
fi
DISTRO_REPO="SLE_${DISTRO_MAJOR_VERSION}${DISTRO_PATCHLEVEL}"
# SLES 12 repo name does not use a patch level so PATCHLEVEL will need to be updated with SP1
#DISTRO_REPO="SLE_${DISTRO_MAJOR_VERSION}${DISTRO_PATCHLEVEL}"