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

Overcome the Oracle Linux awkwardness.

Browse source 
`--enablerepo=XYX` disables ALL OTHER REPOS!!!!
This commit is contained in:
Pedro Algarvio 2014-06-21 13:21:35 +01:00
parent 443077eb5d
commit 4d7c54ae0f
2 changed files with 35 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Version 2014.xx.xx:
* Distro Support Fixed:
* Improve Oracle Linux Server detection
Version 2014.06.19:
* Allow passing the master address as an environment variable, `BS_SALT_MASTER_ADDRESS`
* Fixed an issue with the keys pre-seed. We were passing absolute paths where we only needed

34
bootstrap-salt.sh
View file

@ -2383,7 +2383,14 @@ install_centos_stable_deps() {
fi
fi
yum -y install ${packages} --enablerepo=${_EPEL_REPO} || return 1
if [ $DISTRO_NAME_L = "oracle_linux" ]; then
# We need to install one package at a time because --enablerepo=X disables ALL OTHER REPOS!!!!
for package in ${packages}; do
yum -y install ${package} || yum -y install ${package} --enablerepo=${_EPEL_REPO} || return 1
done
else
yum -y install ${packages} --enablerepo=${_EPEL_REPO} || return 1
fi
if [ $_INSTALL_CLOUD -eq $BS_TRUE ]; then
check_pip_allowed "You need to allow pip based installations (-P) in order to install apache-libcloud"
@ -2396,7 +2403,14 @@ install_centos_stable_deps() {
if [ "x${_EXTRA_PACKAGES}" != "x" ]; then
echoinfo "Installing the following extra packages as requested: ${_EXTRA_PACKAGES}"
yum install -y ${_EXTRA_PACKAGES} --enablerepo=${_EPEL_REPO} || return 1
if [ $DISTRO_NAME_L = "oracle_linux" ]; then
# We need to install one package at a time because --enablerepo=X disables ALL OTHER REPOS!!!!
for package in ${_EXTRA_PACKAGES}; do
yum -y install ${package} || yum -y install ${package} --enablerepo=${_EPEL_REPO} || return 1
done
else
yum install -y ${_EXTRA_PACKAGES} --enablerepo=${_EPEL_REPO} || return 1
fi
fi
return 0
@ -2410,7 +2424,14 @@ install_centos_stable() {
if [ $_INSTALL_MASTER -eq $BS_TRUE ] || [ $_INSTALL_SYNDIC -eq $BS_TRUE ]; then
packages="${packages} salt-master"
fi
yum -y install ${packages} --enablerepo=${_EPEL_REPO} || return 1
if [ $DISTRO_NAME_L = "oracle_linux" ]; then
# We need to install one package at a time because --enablerepo=X disables ALL OTHER REPOS!!!!
for package in ${packages}; do
yum -y install ${package} || yum -y install ${package} --enablerepo=${_EPEL_REPO} || return 1
done
else
yum -y install ${packages} --enablerepo=${_EPEL_REPO} || return 1
fi
return 0
}
@ -2430,7 +2451,12 @@ install_centos_stable_post() {
install_centos_git_deps() {
install_centos_stable_deps || return 1
yum -y install git --enablerepo=${_EPEL_REPO} || return 1
if [ $DISTRO_NAME_L = "oracle_linux" ]; then
# try both ways --enablerepo=X disables ALL OTHER REPOS!!!!
yum -y install ${package} || yum -y install ${package} --enablerepo=${_EPEL_REPO} || return 1
else
yum -y install git --enablerepo=${_EPEL_REPO} || return 1
fi
__git_clone_and_checkout || return 1